Commit graph

588 commits

Author SHA1 Message Date
Jeremy Mikola
dcd3cbb944 Merge branch '2.1.x'
Conflicts:
	Tests/Transformer/ModelToElasticaAutoTransformerTest.php
2013-07-17 15:57:24 -04:00
Jeremy Mikola
4a889406e9 Merge branch '2.0.x' into 2.1.x
Conflicts:
	Tests/Transformer/ModelToElasticaAutoTransformerTest.php
2013-07-17 15:55:55 -04:00
Jeremy Mikola
ab0c27c481 Fix expected exception class (related to #338)
This corrects a typo in a66a37aebd.
2013-07-17 15:54:06 -04:00
Jeremy Mikola
7ae4be0062 Merge branch '2.0.x' into 2.1.x
Conflicts:
	Tests/Transformer/ModelToElasticaAutoTransformerTest.php
2013-07-17 15:49:09 -04:00
Jeremy Mikola
a66a37aebd Merge pull request #338 from FriendsOfSymfony/2.0.x-property-access
Fix missing getter for private field test for PropertyAccess 2.3+
2013-07-17 12:44:57 -07:00
Jeremy Mikola
00f37835fc Rewrite filtered query example in README
Cleaning up the description paragraph and removing extra fields and pagination from the example, since we already have pagination examples elsewhere in the README.
2013-07-16 13:35:27 -04:00
RobertPlant
cce1ffb06c Add filtered query example to README.md 2013-07-16 13:35:27 -04:00
Jeremy Mikola
9e2e8ab1c9 Fix missing getter for private field test for PropertyAccess 2.3+
See: df67239b02
2013-07-12 17:32:33 -04:00
Jeremy Mikola
1af85115df Merge pull request #323 from ajgarlag/orm-provider-order-by
An orderBy DQL  part is required to avoid feching the same row twice
2013-07-08 09:08:11 -07:00
Jeremy Mikola
deb29233ba Merge pull request #330 from tgabi333/patch-1
Remove unused parameter from ModelToElasticaAutoTransformer.php
2013-07-04 13:11:03 -07:00
Gábor Tóth
9beb277745 Remove unused parameter from ModelToElasticaAutoTransformer.php 2013-07-04 18:47:58 +02:00
Antonio J. García Lagar
170864a30d Removes sort call 2013-07-04 08:07:00 +02:00
Jeremy Mikola
5bee33eec9 Merge pull request #321 from ajgarlag/fix-output-color
Fix output colors for single type commands
2013-07-02 13:48:40 -07:00
Lukas Kahwe Smith
8912e52980 Merge pull request #326 from Tobion/patch-1
Allow elastica 0.90. Elasticsearch made the jump from 0.20 to 0.90
2013-06-24 08:52:03 -07:00
Tobias Schultze
8b785c57c3 Allow elastica 0.90. Elasticsearch made the jump from 0.20 to 0.90 2013-06-24 18:44:46 +03:00
Antonio J. García Lagar
b11b4299ef An orderBy DQL part is required to avoid feching the same row twice 2013-06-19 12:36:59 +02:00
Antonio J. García Lagar
0bf6e0b09a Fix output colors 2013-06-18 09:52:44 +02:00
Lukas Kahwe Smith
9d5a0c2ed9 Merge pull request #318 from RobertPlant/patch-1
Update README.md
2013-06-13 03:15:46 -07:00
RobertPlant
fd5ef8005e Update README.md 2013-06-13 11:28:49 +02:00
Jeremy Mikola
7824678e70 Merge pull request #316 2013-06-12 10:48:29 -04:00
RobertPlant
c4cc199fbe Document object mapping implications for Doctrine ORM 2013-06-12 10:47:59 -04:00
Jeremy Mikola
a9c44b491f Merge pull request #292 2013-06-10 10:37:11 -04:00
Jeremy Mikola
b9da709f22 Add documentation for client tagging 2013-06-10 10:37:02 -04:00
Patrick McAndrew
16ecd7cca3 Tag client with fos_elastica.client 2013-06-10 10:30:31 -04:00
Jeremy Mikola
5a64420779 Merge branch '2.1.x'
Conflicts:
	composer.json
2013-06-06 11:21:15 -04:00
Jeremy Mikola
2dfbfffbd0 Update 2.1.x changelog v2.1.2 2013-06-06 11:19:59 -04:00
Jeremy Mikola
692d224b08 Merge branch '2.0.x' into 2.1.x
Conflicts:
	composer.json
2013-06-06 11:18:47 -04:00
Jeremy Mikola
cd48a36687 Update 2.0.x changelog v2.0.2 2013-06-06 11:13:12 -04:00
Jeremy Mikola
00e9a49460 Allow Symfony dependencies until 3.0 2013-06-06 11:02:55 -04:00
Jeremy Mikola
94ab3b1d3c Add PSR Log dependency (see: #304) 2013-05-31 13:16:49 -04:00
Jeremy Mikola
00fde6847a Merge pull request #304 from ceednee/master
Fixes Undefined property: FOS\ElasticaBundle\Client::$logger
2013-05-30 13:18:02 -07:00
ceednee
929c1bfc0d Fixes Undefined property: FOS\ElasticaBundle\Client:: 2013-05-30 21:27:31 +02:00
Lukas Kahwe Smith
860a1f8108 Merge pull request #303 from instaclick/logger-patch
update to PSR3 LoggerInterface per change in ruflin/elastica
2013-05-30 09:54:10 -07:00
Anthon Pang
55edceadcb remove redundant property/method 2013-05-30 16:43:10 +00:00
Anthon Pang
f374dbbaa2 update to PSR3 LoggerInterface per change in ruflin/elastica 2013-05-30 16:26:16 +00:00
Lukas Kahwe Smith
43d1531cd4 cs fix 2013-05-23 00:25:38 +03:00
Lukas Kahwe Smith
16edbfa03b Merge pull request #285 from Appstrakt/master
Updated documentation
2013-05-22 12:56:17 -07:00
Lukas Kahwe Smith
b7eff37f63 Merge pull request #290 from hacfi/readme_fix
Correct serializer configuration in README
2013-05-22 12:54:32 -07:00
Lukas Kahwe Smith
be065735c1 master is 3.0.x 2013-05-22 21:52:48 +02:00
Lukas Kahwe Smith
79327d281c Merge pull request #293 from FriendsOfSymfony/add-path-support
added path support
2013-05-17 00:09:06 -07:00
Lukas Kahwe Smith
50730cca3d added path support, see http://www.elasticsearch.org/guide/reference/mapping/id-field/ 2013-05-17 00:22:46 +02:00
Jeremy Mikola
814460dbf2 Merge branch '2.1.x' 2013-05-15 10:58:47 -05:00
Jeremy Mikola
41c747907c Create 2.1.x changelog v2.1.1 2013-05-15 10:55:30 -05:00
Tim Nagel
c05e0caa9c Added documentation for ignoring missing hits 2013-05-15 09:59:52 -05:00
Tim Nagel
00b67fd8a4 Ignore missing index hits 2013-05-15 09:59:43 -05:00
Philipp Wahala
d6e8134189 Correct serializer configuration in README 2013-05-15 15:56:21 +02:00
Arne Stockmans
23dfd3f595 Renamed is_indexable_callback_class back to is_indexable_callback 2013-05-08 14:29:22 +02:00
Lukas Kahwe Smith
b8a4a47b38 renamed PurgeCommand to ResetCommand 2013-05-08 09:10:40 +02:00
Lukas Kahwe Smith
b5392df9fd Merge pull request #280 from FriendsOfSymfony/purge_command
added purge command
2013-05-07 04:54:08 -07:00
Lukas Kahwe Smith
f48ae85cc8 added missing use statement 2013-05-06 10:32:50 +02:00