Commit graph

1,015 commits

Author SHA1 Message Date
Jeremy Mikola
3ea70afd7e Merge pull request #241 from nurikabe/patch-1
Fix odd grammar
2013-02-22 11:27:58 -08:00
Evan Owens
1992d6f0d6 Fix odd grammar 2013-02-22 14:03:40 -05:00
Lea Haensenberger
7e85f79f8e Merge remote-tracking branch 'origin/master' into recursive_field_config
Conflicts:
	DependencyInjection/Configuration.php
2013-02-22 10:46:43 +01:00
Jeremy Mikola
737b73b947 Merge pull request #240 from tyx/dev/query-time-debugbar
Query time in debugbar
2013-02-21 09:44:26 -08:00
tyx
f66858ff3e Add test for the query time in datacollector 2013-02-21 10:52:49 +01:00
tyx
9c60a5ccac Add totalquery time in debugbar (like Doctrine does) 2013-02-21 10:37:04 +01:00
Jeremy Mikola
2171755e5a Merge pull request #231 from marcoleong/patch-1
The finder was not created in that section
2013-02-11 12:51:52 -08:00
Marco Leong
6995d75dc8 The finder was not created in that section
The finder was not created in that section, use repository instead, make more sense for user
2013-02-07 17:12:38 +08:00
Richard Miller
48d665e2ea Merge pull request #211 from liip-forks/fields_in_properties
Adding the fields configuration to the properties so multi_field fields ...
2013-02-03 11:49:51 -08:00
Richard Miller
c82999fd8e Merge pull request #204 from micjohnson/patch-4
Add access to compression and disabling of _source from configuration
2013-02-03 11:45:37 -08:00
Richard Miller
bfb0f823c1 Merge pull request #203 from micjohnson/patch-3
Adding _routing to type configuration
2013-02-03 11:44:51 -08:00
Richard Miller
ef869be10b Update README.md
Adding details of the ```index_name``` config
2013-02-03 19:38:53 +00:00
Richard Miller
94d89159bd Merge pull request #207 from Exercise/index-aliasing
Adding configuring index name separately from service name
2013-02-03 11:32:37 -08:00
Richard Miller
76a3339e16 Merge pull request #216 from daFish/fix/issue-213
Fixes problem with potential null values coming from nested properties.
2013-02-03 11:23:44 -08:00
Richard Miller
c73a151115 Merge pull request #219 from megazoll/dev-deps
Updated dev deps
2013-02-03 11:21:15 -08:00
Lea Haensenberger
71ccacc6b3 using getConfiguration and removing unnecessary end statements 2013-02-01 15:37:57 +01:00
Lea Haensenberger
decd8a318d fixing CS problems 2013-02-01 14:55:59 +01:00
Jeremy Mikola
3cfa2c1ef6 Merge pull request #192 from kibao/fix-custom-finder
Fix register custom finder for entity
2013-01-30 13:44:27 -08:00
Przemysław Piechota
10ce9a6d0a CS 2013-01-30 22:24:19 +01:00
Lea Haensenberger
6e62d41d06 Merge remote-tracking branch 'origin/master' into recursive_field_config 2013-01-28 12:08:19 +01:00
Lea Haensenberger
02f3281a7a Fixing wrong default value 2013-01-28 11:55:54 +01:00
Lea Haensenberger
869b8b734e Using the config array to determine the needed nesting levels, building the config tree based on that 2013-01-28 11:53:50 +01:00
Vyacheslav Salakhutdinov
e9be67d59b Updated dev deps 2013-01-25 14:59:24 +04:00
daFish
82ec81cb08 Fixes problem with potential null values coming from nested properties. 2013-01-24 16:43:10 +01:00
Richard Miller
f7e697aacf Merge pull request #215 from daFish/fix/configuration
Added missing ~ to all configuration parameters.
2013-01-24 06:24:24 -08:00
daFish
6ff09f8cc1 Added missing ~ to all configuration parameters. 2013-01-24 14:53:28 +01:00
Lea Haensenberger
4055ff305f Adding the fields configuration to the properties so multi_field fields can also be defined in properties 2013-01-10 15:00:21 +01:00
Lea Haensenberger
2119a4b39f Adding support for infinite nesting level in field configurations 2013-01-10 12:25:34 +01:00
Richard Miller
93236752c4 Adding configuring index name separately from service name 2013-01-04 14:02:50 +00:00
micjohnson
b2314f21c6 Update DependencyInjection/Configuration.php
add access to compression and disabling of _source
2012-12-12 07:49:37 -08:00
micjohnson
d9367c7ed8 Update DependencyInjection/FOQElasticaExtension.php 2012-12-12 06:25:55 -08:00
micjohnson
ea921c8abe Update DependencyInjection/Configuration.php
Adding _routing for types
2012-12-12 06:23:54 -08:00
Jeremy Mikola
973d67f0c1 Merge pull request #161 from NicolasBadey/patch-1
Update composer.json
2012-12-05 09:50:24 -08:00
NicolasBadey
ab84d89eb7 rebase upstream 2012-12-05 17:28:34 +01:00
Richard Miller
04ddfcce43 Merge pull request #197 from craigmarvelley/allow-multi-field-type
Remove exception when multi_field type is used
2012-11-30 05:39:43 -08:00
craig
7717d4d580 Remove exception when multi_field type is used 2012-11-29 14:32:47 +00:00
Richard Miller
9b5c26d3e3 Merge pull request #196 from daFish/fix/undefinedindex
Fixes undefined index error when populating index
2012-11-29 01:32:22 -08:00
daFish
e5fef260f2 Changed servers to numeric indexes instead of associative indexes 2012-11-29 10:00:51 +01:00
Richard Miller
1bcc518b31 Merge pull request #191 from odolbeau/feat-nodes
Allow multiple servers in configuration
2012-11-28 13:19:01 -08:00
Richard Miller
5ea8bb9688 Merge branch 'master' of github.com:Exercise/FOQElasticaBundle 2012-11-28 21:17:20 +00:00
Richard Miller
8fde6b235c Merge branch '2.0'
Conflicts:
	Transformer/ElasticaToModelTransformerCollection.php
2012-11-28 21:15:13 +00:00
Richard Miller
62b28a813e Merge remote-tracking branch 'cup-of-giraf/nested'
Conflicts:
	DependencyInjection/Configuration.php
2012-11-28 21:13:04 +00:00
Richard Miller
7d90c1fdc1 Merge pull request #190 from daFish/feature/symfony22
Added support for Symfony 2.2 to composer.json
2012-11-28 12:54:20 -08:00
Richard Miller
9b2dc40bc1 Merge pull request #172 from kostiklv/properties-mapping
Support for properties of objects/nested documents
2012-11-28 12:49:14 -08:00
Richard Miller
51f03ebbc3 Merge pull request #167 from Exercise/fixing_collection_identifier
Fixing identifier field not being set in TransformerCollection
2012-11-28 12:45:34 -08:00
Julien Muetton
79eb062cf7 add _parent in mapping during index reset 2012-11-28 12:07:09 +01:00
Julien Muetton
10eae2f254 fixes php5.3 defines ~ for default empty _parent property 2012-11-26 16:04:50 +01:00
Julien Muetton
a36ec87f40 Add tests for _parent, nested and object types 2012-11-26 14:47:08 +01:00
Julien Muetton
ea3191033f add documentation for nested, object and _parent 2012-11-26 13:55:48 +01:00
Julien Muetton
23f591bf01 allow _parent mapping 2012-11-26 13:50:14 +01:00