Commit graph

1,031 commits

Author SHA1 Message Date
Piotr Antosik
2a7459f327 Fix changelog header 2014-11-10 14:05:56 +01:00
Tim Nagel
25d56d0a0f 3.1.x requires doctrine 2.4+ 2014-10-03 08:21:02 +10:00
Tim Nagel
a88e4e38f8 Merge branch 'cs-fixes-31' 2014-09-21 21:09:39 +10:00
Tim Nagel
5cdeac9b45 Merge branch '3.0.x' 2014-09-21 21:09:33 +10:00
Michael Schramm
b3f87e414f move classes to parametes 3.0.5 2014-09-21 21:08:41 +10:00
Tim Nagel
71a86cada5 BC BREAK: Add handlesObject method to ObjectPersisterInterface 2014-09-21 20:25:32 +10:00
Tim Nagel
d0ce82ac2a Adjust DoctrineListener to remove unnecessary method getDoctrineObject 2014-09-21 20:25:25 +10:00
Tim Nagel
428a1014ca Move query logging into its own method 2014-09-21 20:12:30 +10:00
Tim Nagel
1d5fe44ca4 Fix CS from scrutiniser-ci 2014-09-21 20:12:30 +10:00
Tim Nagel
cf586a4ef4 Merge branch '3.0.x' 2014-09-04 09:39:54 +10:00
Tim Nagel
c4210a5c6d Fix previous merge 2014-09-04 09:37:27 +10:00
Tim Nagel
029ebb153a Merge remote-tracking branch 'upstream/pr/705' into 3.0.x
Conflicts:
	Index/AliasProcessor.php
2014-09-04 09:26:53 +10:00
Tim Nagel
736163551c Merge remote-tracking branch 'upstream/pr/704' into 3.0.x 2014-09-04 09:17:34 +10:00
Patrick McAndrew
76dcd2f62e fix warning if no aliases
PHP Warning:  array_keys() expects parameter 1 to be array, AliasProcessor.php on line 128
2014-08-29 15:52:46 +01:00
Patrick McAndrew
2958833012 Ability to delete an index if expecting an alias 2014-08-28 17:59:58 +01:00
Tim Nagel
6bea3c2154 Add code quality badge 2014-08-21 23:23:20 +10:00
Tim Nagel
001daeeac0 Merge branch '3.0.x' 2014-08-21 23:17:42 +10:00
Tim Nagel
a7a23b92cb Merge pull request #698 from merk/new-testing v3.0.4
Update testing
2014-08-21 23:15:38 +10:00
Tim Nagel
598a59927e Update travis testing 2014-08-21 22:54:12 +10:00
Patrick McAndrew
0425379420 add back fos_elastica.client tag that was removed in e78950ddb7 2014-08-21 22:18:53 +10:00
Tim Nagel
380727afbe Merge pull request #695 from notFloran/fix-search-annotation
Use the new Search annotation
2014-08-21 21:54:23 +10:00
Floran Brutel
69c2214bc5 Use the new Search annotation
Use "FOS\ElasticaBundle\Annotation\Search" instead of "FOS\ElasticaBundle\Configuration\Search" in the repository manager.
Update the cookbook
2014-08-18 13:30:45 +02:00
Tim Nagel
af5fb7e97e Merge pull request #694 from notFloran/update-version-setup
Update version in setup.md
2014-08-17 21:13:11 +10:00
Floran Brutel
22a2a223cc Update version in setup.md
Use "~3.0" instead of "~3.0.2" to get version 3.0.3 and future minor
versions
2014-08-17 12:16:15 +02:00
Tim Nagel
c08d86124a Merge branch '3.0.x' 2014-08-11 08:44:22 +10:00
Luis Cordova
33ee047f83 fix dependency on elastic extension
i had a weird error in which just installing the bundle with "friendsofsymfony/elastica-bundle":     "~3.0.2",
game me a version back even before it had a composer! 😊
i checked and found out composer gets really confused or glitchy with packages not following semver.
In any case 1.3.0 is out, and i remove the 4th digit which i think composer ignores totally or gets confused about.
2014-08-11 08:44:15 +10:00
Tim Nagel
49c5b2ee63 Merge branch 'pr/685' 2014-08-08 21:37:20 +10:00
Oleg Andreyev
27385046ca changing AliasProcessor::setRootName, so to use "Y-m-d-His" instead of random string 2014-08-08 21:36:49 +10:00
Tim Nagel
517d6e679c Merge branch '3.0.x' 2014-08-08 21:31:14 +10:00
Tim Nagel
420135dc85 Merge branch 'travis-fixing' into 3.0.x 2014-08-08 10:00:55 +10:00
Tim Nagel
20033709cf Fix empty mappings for old ES versions 2014-08-08 09:59:24 +10:00
Tim Nagel
229d4cb982 Merge branch '3.0.x' 2014-08-08 08:36:36 +10:00
Tim Nagel
84cf6c79c2 Merge remote-tracking branch 'upstream/pr/684' into 3.0.x v3.0.3 2014-08-08 08:33:59 +10:00
Tim Nagel
9d45de8b64 Merge pull request #684 from cygnusb2b/deep-merging-config
Configuration Bug: Restored noDeepMerging
2014-08-08 08:33:09 +10:00
Josh Worden
f5987a48b9 BC Break: Restored noDeepMerging to Configuration
When performNoDeepMerging is not used, Symfony environment-specific server configurations no longer work.
2014-08-07 16:33:14 -05:00
Tim Nagel
dafe8abe0e Output ES version 2014-08-07 09:32:30 +10:00
Tim Nagel
0d22c20d37 Merge remote-tracking branch 'upstream/pr/682' into 3.0.x 2014-08-07 09:26:11 +10:00
Tim Nagel
f9eb6577d1 Add tests to cover no mappings for serializer enabled type 2014-08-07 09:25:49 +10:00
Tim Nagel
c44f676224 Test mappings key being null still causes appropriate configuration changes 2014-08-07 09:25:09 +10:00
Luis Cordova
9296534d30 Update setup.md 2014-08-06 17:25:05 -05:00
Tim Nagel
f6e018f011 Merge remote-tracking branch 'upstream/pr/679' into 3.0.x 2014-08-04 08:53:14 +10:00
Lukasz Cybula
9a5b80e723 Ignore missing Doctrine results during hybridTransform() 2014-07-31 14:13:01 +02:00
Tim Nagel
eaa6c2e085 Merge branch '3.0.x' 2014-07-31 15:55:37 +10:00
Tim Nagel
64c5c19831 Merge branch 'pr/675' into 3.0.x v3.0.2
Closes #675
2014-07-31 15:54:53 +10:00
Pablo
9befa90f41 Return repository in Manager Class MongoDB 2014-07-31 15:54:22 +10:00
Tim Nagel
c748ec64e9 Merge pull request #672 from merk/gh663
Fix indexable callbacks being overwritten by another index
2014-07-23 23:10:24 +10:00
Tobias Nyholm
11ee25cfea Added PHP 5.6 2014-07-23 21:47:10 +10:00
Tim Nagel
e5410a5b65 Fix indexable callbacks being overwritten by another index
closes #663
2014-07-23 21:38:46 +10:00
Tim Nagel
9fbc622929 Merge pull request #671 from merk/completion-type-fix v3.0.1
Fix completion type
2014-07-23 20:06:33 +10:00
Tim Nagel
fad481d822 Fix completion type 2014-07-23 20:00:14 +10:00