Commit graph

202 commits

Author SHA1 Message Date
Ray 41b347dfe4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	Logger/ElasticaLogger.php
	README.md
2014-03-18 19:59:27 -04:30
rayrigam de70e78b53 Update Configuration.php
Updated to support any HTTP request header type in the "headers" section.
2014-03-18 18:14:03 -04:30
Tim Nagel 5292a2adad Merge pull request #463 from FriendsOfSymfony/add-hotswapping-aliased-indexes-on-populate
Add support for using aliases to allow hot swapping of indexes.
2014-03-17 09:20:12 +11:00
Tim Nagel 49521e9fc4 Merge branch 'master' into add-hotswapping-aliased-indexes-on-populate
Conflicts:
	Resetter.php
2014-03-17 09:18:57 +11:00
Tim Nagel 857c1c8e48 Merge pull request #415 from nurikabe/master
Refactoring to update ElasticSearch index in postFush
2014-03-17 09:11:43 +11:00
Tim Nagel 6cd69ad131 Merge pull request #361 from xphere-forks/master
Add support for include_in_parent and include_in_root options
2014-03-14 08:53:42 +11:00
Tim Nagel 48edc195cd Merge pull request #484 from bits4breakfast/containeraware-callback
Container is now available in Callback
2014-03-14 08:41:15 +11:00
Ray 0116a6ac4f Add support for clients requiring basic HTTP authentication 2014-03-06 12:38:23 -04:30
Berny Cantos 7f53badad5 Add support for include_in_{parent,root} for nested and objects 2014-03-06 12:31:50 +01:00
tgallice 418b9d72ce Rework configuration validation to fix #461 2014-03-04 17:58:10 +01:00
Matteo Galli eecdd3474a Fixes #459 2014-02-21 16:47:42 +01:00
Tim Nagel cb2eeba318 Merge pull request #461 from tgallice/url_parameter
Force slash at the end of the url parameter
2014-02-19 13:40:18 +11:00
Tim Nagel aa9d74a8a0 Merge remote-tracking branch 'PeerJ/AddServerTimeout'
Conflicts:
	DependencyInjection/Configuration.php
2014-02-19 13:39:03 +11:00
Patrick McAndrew 3065c96a2c Add ability to specify server timeout 2014-02-14 17:32:22 +00:00
Richard Miller 3b1a756e6f Add support for using aliases to allow hot swapping of indexes when populating 2014-02-06 21:11:12 +00:00
tgallice 04390b37d1 Force slash at the end of the url parameter 2014-02-04 10:07:58 +01:00
nurikabe 93c6085fa5 Merge remote-tracking branch 'upstream/master' 2014-02-01 02:15:52 +00:00
Laszlo Horvath 5480e037e3 adding ttl for documents 2014-01-30 12:39:48 +01:00
Tim Nagel ef872dd22d Merge pull request #439 from FriendsOfSymfony/type-timestamp
Adding support for enabling timestamps
2014-01-20 12:57:02 -08:00
Tim Nagel f0f6fc8129 Merge pull request #441 from klmatom/master
Add similarity as a valid field mapping.  http://www.elasticsearch.org/g...
2014-01-20 12:56:47 -08:00
Tom A 4287a91d50 Add similarity as a valid field mapping. http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-core-types.html#similarity 2014-01-16 23:05:44 -05:00
nurikabe 4a4716a55b Merge remote-tracking branch 'upstream/master' 2014-01-11 16:38:29 +00:00
Vermi 73ee750515 Removing "->performNoDeepMerging()"in indexes configuration, allowing custom Bundle defining new types in an existing index.
Configuration is injected in the new Bundle using prependExtensionConfig()
2014-01-10 16:25:45 +01:00
Lea Haensenberger 274fc00991 Add store and index options to timestamp 2014-01-06 10:19:11 +01:00
Lea Haensenberger 4ee81dc010 Adding support for enabling timestamps 2014-01-06 09:20:44 +01:00
nurikabe 3bd9155f46 Use constants of corresponding events classes rather than making assumption about string values. 2013-12-13 17:51:15 +00:00
Lea Haensenberger a59385af7b Do not set default value to *, might conflict when using e.g. path_match and match_pattern regex together 2013-12-10 15:37:41 +01:00
Lea Haensenberger e55c7e8632 Set match to '*' by default 2013-12-10 15:21:46 +01:00
Lea Haensenberger 09031457cd Allow more matching methods 2013-12-10 15:21:46 +01:00
Lea Haensenberger eaf52fa907 Allow a more dynamic mapping for dynamic templates 2013-12-10 15:21:46 +01:00
Császár Dániel e16ece821d Fix client configuration missing logger 2013-12-10 13:54:50 +01:00
Tim Nagel da44ee65f6 Merge pull request #395 from pierredup/logger
Add option to enable logger and define logger class
2013-12-10 02:17:10 -08:00
Tim Nagel e1ed7bdc67 Merge pull request #420 from FriendsOfSymfony/all-field-config
Add support to disable the _all field for a type
2013-12-10 02:16:23 -08:00
Tim Nagel 8668537740 Merge pull request #400 from cordoval/cleanups
clean ups
2013-12-10 02:15:53 -08:00
Tim Nagel fc64078575 Merge pull request #413 from damienalexandre/serializer-integration
Serializer support in providers and mapping configuration fixes
2013-12-09 12:35:26 -08:00
Lea Haensenberger 8f1b52328f Merge remote-tracking branch 'origin/master' into all-field-config
Conflicts:
	DependencyInjection/FOSElasticaExtension.php
2013-12-06 08:25:02 +01:00
Lea Haensenberger 08193ec2fd Add support to disable the _all field for a type 2013-12-05 16:35:30 +01:00
Pierre du Plessis 759950aff6 Add option to disable logger or specify different logger service 2013-12-04 22:09:27 +02:00
nurikabe 3a279f8edb Remove debug. 2013-12-04 10:46:05 +00:00
Richard Miller a227a3f076 Merge branch '2.1.x' 2013-12-04 08:03:04 +00:00
Richard Miller 2980ee818a Merge branch '2.0.x' into 2.1.x 2013-12-04 08:02:22 +00:00
Ben Longden 8b6dffbc14 Adds enabled mapping option (default true) 2013-12-04 07:53:08 +00:00
nurikabe 22a5d67d05 pre/postFlush configuration. Update documentation. 2013-12-03 20:41:26 +00:00
nurikabe 5ec652063d Don't need postRemove. 2013-12-01 21:48:41 +00:00
nurikabe f258c9ddc0 Exploratory development for https://github.com/FriendsOfSymfony/FOSElasticaBundle/issues/410 2013-12-01 21:17:55 +00:00
Damien Alexandre 3027c687e2 Ref #341, fix the insertMany method to use Bulk indexing
To make it works, I inject the serializer defined for the Type
into the fos_elastica.object_serializer_persister service.

This is the SAME service injected in the setSerializer of Type.

We deport the handling of serialization outside Elastica,
this is not so good but we need to build our own Documents to
get the ID's correctly.
2013-11-29 15:35:59 +01:00
Damien Alexandre 2862259d8e Allow empty or null or no mappings: key under type configuration
refs #300. This commit allow to define types without having to
set any mapping as Elasticsearch build his own.

The minimal config become:

    indexes:
        toto:
            client: default
            types:
                Article:
                    mappings: ~
                    ...
2013-11-29 14:59:56 +01:00
Damien Alexandre d546b4d3f3 Merge remote-tracking branch 'origin/serializer-transformer' into serializer-integration
Conflicts:
	DependencyInjection/FOSElasticaExtension.php
	Resources/config/config.xml
2013-11-29 10:07:13 +01:00
Luis Cordova cacb40286c clean ups 2013-11-20 08:11:15 -05:00
Tim Nagel 3c26f157aa Merge branch '2.1.x'
Conflicts:
	Tests/ResetterTest.php
2013-11-11 13:30:29 +11:00