Commit graph

530 commits

Author SHA1 Message Date
Richard Miller b05af88931 Merge branch '2.0'
Conflicts:
	Doctrine/AbstractElasticaToModelTransformer.php
2012-08-07 19:14:16 +01:00
Richard Miller 43e6e84c5b Merge remote-tracking branch 'nurikabe/2.0' into 2.0 2012-08-07 18:57:25 +01:00
Richard Miller af8f5f1ecc Merge branch '2.0'
Conflicts:
	README.md
2012-08-06 23:32:09 +01:00
Richard Miller 5251829f53 Added hybrid results to README 2012-08-06 23:30:31 +01:00
Richard Miller 5de1f5ca2d Fixed wrong type in documentation of manual provider 2012-08-06 23:24:27 +01:00
Richard Miller 0505cb55f2 Merge branch '2.0'
Conflicts:
	Finder/RawFinder.php
2012-08-06 23:13:43 +01:00
Richard Miller 59ba64cfe1 Stopped installing dev requires in travis as currently not being resolved successfully by composer 2012-08-06 23:12:44 +01:00
Richard Miller 6de220c878 Removed RawFinder as per GH-133 2012-08-06 23:11:50 +01:00
Richard Miller e269e14b10 Merge pull request #145 from Schyzophrenic/master
Fix resultSet size when using a Repository for master
2012-08-06 15:01:38 -07:00
Richard Miller 97d7ea8c67 Merge pull request #144 from Schyzophrenic/2.0
Fix resultSet size when using a Repository for 2.0
2012-08-06 15:01:02 -07:00
Schyzophrenic 3b391919c9 Fix resultSet size when using a Repository
When using a Repository, the $limit parameter was lost along the way.
This is why the limit was always set to 10 in that case.
2012-08-05 02:43:52 +03:00
Schyzophrenic 93c0f608c2 Fix resultSet size when using a Repository
When using a Repository, the $limit parameter was lost along the way.
This is why the limit was always set to 10 in that case.
2012-08-05 02:35:32 +03:00
Richard Miller 123da22ebd Merge remote-tracking branch 'Fran6co/imp-lat_lon'
Conflicts:
	DependencyInjection/Configuration.php
2012-08-02 14:54:49 +01:00
Richard Miller 8ca25641f8 Merge pull request #139 from Fran6co/fix-paginator
fix for #138, query can be a string or a Elastica_Query
2012-08-02 06:12:45 -07:00
Richard Miller 3b4b91729f Merge pull request #141 from korstiaan/patch-1
Moved `identifier` to `persistence` in README
2012-08-02 06:11:41 -07:00
Richard Miller d7980bc419 Added installing mongo extension to travis config 2012-08-02 14:09:20 +01:00
Richard Miller f0c4cb23e3 Merge pull request #142 from korstiaan/include_in_all
Added `include_in_all` as mapping property
2012-08-02 05:56:18 -07:00
Korstiaan de Ridder dbf0e27386 Added include_in_all as mapping property 2012-08-01 13:52:08 +02:00
Korstiaan de Ridder 83cfd59902 Moved identifier to persistence in README
`identifier` config var is child of `persistence` root, and not `provider`
2012-07-31 17:36:32 +03:00
Francisco Facioni 0ede5ffc67 fix for #138, query can be a string or a Elastica_Query 2012-07-27 15:06:00 -03:00
Francisco Facioni f58cf6e63c adds support for lat_lon flag as specified in http://www.elasticsearch.org/guide/reference/mapping/geo-point-type.html 2012-07-25 18:29:35 -03:00
nurikabe 37f3d656b5 Remove really old-school comment-based archival mechanism. 2012-07-16 13:08:26 -04:00
nurikabe 0c21eb4333 Highlightable models. 2012-07-16 11:49:28 -04:00
Richard Miller c7e0e88ece Merge branch '2.0'
Conflicts:
	composer.json
2012-07-10 22:50:04 +01:00
Richard Miller 60d3ef69f3 Specified specific Elastica version in composer.json 2012-07-10 22:48:40 +01:00
Richard Miller 16ab1481d2 Merge branch '2.0' 2012-07-10 21:38:42 +01:00
Richard Miller d9561795f5 Changed travis config to install dev requirements 2012-07-10 21:37:53 +01:00
Richard Miller 2732296aed Merge branch '2.0'
Conflicts:
	Doctrine/AbstractElasticaToModelTransformer.php
	Doctrine/MongoDB/ElasticaToModelTransformer.php
	Doctrine/ORM/ElasticaToModelTransformer.php
	composer.json
2012-07-10 21:37:23 +01:00
Richard Miller cc410cb804 Added require-dev section to composer.json 2012-07-10 21:29:18 +01:00
Richard Miller 1626910299 Removed unneccesary argument from findByIdentifiers methods 2012-07-10 21:28:31 +01:00
Richard Miller affc50a2eb Added type hint to Repository constructor 2012-07-10 20:41:27 +01:00
Richard Miller 3d2252a688 Changed finder interface hierarchy 2012-07-10 20:38:08 +01:00
Richard Miller 76f583324e Converted indentation to spaces 2012-07-10 20:32:45 +01:00
Richard Miller 50ba50f848 Added findHybrid to the repository 2012-07-10 20:30:19 +01:00
Richard Miller 886ffbe279 Merge pull request #132 from Fran6co/imp-add-paginator-repository
adds createPaginatorAdapter to the repository
2012-07-10 12:18:06 -07:00
Francisco Facioni b7df8fb651 adds createPaginatorAdapter to the repository 2012-07-10 13:16:44 -03:00
Richard Miller 7a8664727c Merge remote-tracking branch 'origin/attachment_type_transformation'
Conflicts:
	Tests/Transformer/ModelToElasticaAutoTransformerTest.php
	Transformer/ModelToElasticaAutoTransformer.php
2012-07-08 15:38:09 +01:00
Richard Miller a787dcbe53 Merge pull request #119 from Fran6co/imp-knp-paginatior
Added knp paginator support
2012-07-08 06:59:54 -07:00
Richard Miller aa611605b6 Updated test to reflect changes in the way properties are accessed in the transformer 2012-07-08 14:31:19 +01:00
Richard Miller e37d22c220 Added minimum-stability to composer.json 2012-07-08 14:22:39 +01:00
Richard Miller c0cf0b921c Merge pull request #131 from Fran6co/fix-reset
Bugfix: missing 'parameters' is causing 'MapperParsingException' when resetting index
2012-07-08 05:35:21 -07:00
Francisco Facioni 4f26eb6e21 Updated Test to reflect actual configuration case (this bundle is using arrays instead of Elastica_Type_Mapping) 2012-07-02 10:00:40 -03:00
Francisco Facioni a6ca1bec7c Bugfix: missing 'parameters' was causing 'MapperParsingException' when resetting index 2012-06-29 13:05:18 -03:00
Jeremy Mikola 765d875d86 Merge pull request #113 from Fran6co/fix-propertypath
Using PropertyPath for resolving what getter to use
2012-06-14 07:43:45 -07:00
Richard Miller b721e86412 Merge pull request #126 from geoffrey-brier/master
Fixed missing argument concerning the foq:elastica:populate command
2012-06-14 04:55:10 -07:00
Geoffrey Brier 9dd4943af7 Fixed missing argument concerning the foq:elastica:populate command 2012-06-14 13:36:48 +02:00
Francisco Facioni 59bf8a1efd More CS 2012-06-13 15:40:27 -03:00
Francisco Facioni 2bf7344fbb CS 2012-06-13 15:28:16 -03:00
Francisco Facioni 33397ec467 Added to the documentation how to paginate with knp paginator 2012-06-13 13:40:41 -03:00
Richard Miller d0085057d5 Fixed modifier issue in Test 2012-06-13 17:22:13 +01:00