Commit graph

6 commits

Author SHA1 Message Date
Tim Nagel e78950ddb7 Merge branch 'master' into typed-config
Conflicts:
	CHANGELOG-3.0.md
	Client.php
	DependencyInjection/Configuration.php
	DependencyInjection/FOSElasticaExtension.php
	DynamicIndex.php
	Resources/config/config.xml
	Resources/config/mongodb.xml
	Resources/config/orm.xml
	Tests/DependencyInjection/ConfigurationTest.php
	composer.json
2014-06-17 22:42:15 +10:00
Tim Nagel 94568d9554 Merge pull request #608 from merk/populate-indexable
Indexable callback refactoring, implemented callback in Provider
2014-06-17 10:11:46 +10:00
Tim Nagel 0383811834 Fix test, add test for failing mappings 2014-06-16 23:28:53 +10:00
Tim Nagel ada3942576 Config Source providers 2014-06-16 23:23:49 +10:00
Tim Nagel 66d2410999 Move Indexable callback calculations to a new service 2014-06-16 15:57:42 +10:00
Tim Nagel 5009673b6a Functional Tests v1 2014-06-08 22:35:38 +10:00