Christophe Coevoet
133f71b88a
Merge branch '3.1.x'
2015-03-12 17:49:49 +01:00
Christophe Coevoet
c013ed9657
Merge branch '3.0.x' into 3.1.x
...
Conflicts:
Resources/config/orm.xml
2015-03-12 17:49:25 +01:00
Christophe Coevoet
f72c51503a
Fix the service definitions when the logger is not set in listener
...
The empty tag is parsed to an empty string, not to null. And this is not
a valid value for the service
2015-03-12 17:44:57 +01:00
Tim Nagel
4e087af50d
Fix issues with CS merge
2015-03-12 22:41:48 +11:00
Tim Nagel
559b14b4a5
Merge branch '3.1.x'
2015-03-12 22:02:06 +11:00
Tim Nagel
2215d07ff8
Merge pull request #818 from merk/cs-fixes-30
...
php-cs-fixer for 3.0.x
2015-03-12 21:58:21 +11:00
Tim Nagel
89db88c2a0
CS fixes for 3.1
2015-03-12 21:58:02 +11:00
Tim Nagel
345b5d423d
Merge cs-fixes-30 into cs-fixes-31
2015-03-12 21:57:26 +11:00
Tim Nagel
a8f41fa5ef
We do not provide API guarantees
2015-03-12 21:47:19 +11:00
Tim Nagel
e796d6179b
Elastica, Doctrine\Common and Doctrine\ORM are required for tests
2015-03-12 21:21:18 +11:00
Tim Nagel
dd388e4b25
CS fixes
2015-03-12 21:20:00 +11:00
Tim Nagel
81186e40db
Bump master to 3.2-dev
2015-03-12 20:36:50 +11:00
Tim Nagel
14af748840
Fix bad merge
2015-03-12 18:22:04 +11:00
Tim Nagel
19e9abaa53
Update documentation links for 3.1 and 3.0
2015-03-11 22:21:56 +11:00
Tim Nagel
5b88baeca6
Merge branch 'pr/744'
...
Conflicts:
CHANGELOG-3.1.md
Command/PopulateCommand.php
2015-03-11 22:17:14 +11:00
Tim Nagel
b7c7f77383
Merge branch 'pr/725'
...
Conflicts:
CHANGELOG-3.1.md
Doctrine/AbstractProvider.php
2015-03-11 22:10:54 +11:00
Tim Nagel
181b5a0ac0
Merge pull request #815 from merk/command-tidy
...
Command tidy
2015-03-11 22:09:00 +11:00
Tim Nagel
0009c858a7
Fixes for errors when with the progress closure
2015-03-11 21:31:23 +11:00
Tim Nagel
f834499a2c
Fixes after review
2015-03-11 15:54:04 +11:00
Tim Nagel
3d69c08b5a
Merge branch 'master' into pr/725
...
Conflicts:
Doctrine/AbstractProvider.php
2015-03-11 15:47:03 +11:00
Tim Nagel
cbb247978a
Update changeling for aggregations
2015-03-11 15:37:34 +11:00
Tim Nagel
a830a9b7b6
Merge pull request #726 from cassianotartari/master
...
Add aggregations
2015-03-11 15:34:47 +11:00
Tim Nagel
7b90c84daa
Merge pull request #728 from ugomeda/master
...
Add missing KnpPaginator example in the usage documentation
2015-03-11 15:33:03 +11:00
Tim Nagel
034b3a9c60
Merge branch '3.0.x'
2015-03-11 15:30:09 +11:00
Evgeniy Sokolov
cf9f7c6be8
fix error for empty type configuration
2015-03-11 15:29:17 +11:00
Tim Nagel
4a564401b4
Symfony <=2.5 uses the legacy progress closure
2015-03-11 15:17:06 +11:00
Tim Nagel
ef2671dd36
Moved the progress helper closure building to a dedicated class
2015-03-11 15:11:42 +11:00
Tim Nagel
47785260a4
Fix an error that PopulateCommand would always ignore errors
2015-03-11 15:11:13 +11:00
Tim Nagel
cb7b4c1dca
Configurable ProgressBar format definition overrides
2015-03-11 15:09:48 +11:00
Tim Nagel
4c87d24fc1
Changes after review
2015-03-11 14:55:13 +11:00
Tim Nagel
f6df88cc67
Merge branch 'master' into pr/744
...
Conflicts:
Command/PopulateCommand.php
2015-03-11 14:11:18 +11:00
Tim Nagel
7fa14f713c
Merge branch '3.0.x'
2015-03-10 22:01:24 +11:00
Tim Nagel
55bfee22e8
Cache composer
2015-03-10 22:00:09 +11:00
Tim Nagel
07995d9b75
Merge pull request #794 from merk/property-paths
...
Added capability to define property paths
2015-03-10 21:58:32 +11:00
Tim Nagel
72a981ab51
Attempted fix for php 5.3
2015-03-10 21:49:26 +11:00
Tim Nagel
1be1cb645c
Merge pull request #809 from chtipepere/patch-1
...
Update usage.md
2015-03-10 21:13:21 +11:00
Marichez Pierre
70fe702ccf
Update usage.md
...
Fix indent in yml
2015-03-07 22:06:32 +01:00
WouterJ.nl bot
3c87cc16c7
Merge branch '3.0.x'
2015-02-18 11:38:02 +01:00
Tim Nagel
c5185a0307
Added capability to define property paths
2015-02-09 09:40:49 +11:00
Tim Nagel
e1d5ef72d2
Merge pull request #792 from FriendsOfSymfony/progress-bar-bc
...
Additional change for 2.5 ProgressBar support
2015-02-07 00:03:50 +11:00
Tim Nagel
797d066286
Additional change for 2.5 ProgressBar support
...
getProgress() is not available and getStep() throws a deprecation warning.
2015-02-06 23:50:39 +11:00
Tim Nagel
72589f8341
Fix ProgressBar for Symfony 2.5
2015-02-06 22:07:13 +11:00
Tim Nagel
2401b1083c
Bump version
2015-01-31 18:33:07 +11:00
Tim Nagel
8e627ee011
Merge pull request #788 from FriendsOfSymfony/elastica-bump
...
Update Elastica dependency
2015-01-31 18:31:08 +11:00
Tim Nagel
6992beeb47
Update Elastica dependency
2015-01-31 18:24:47 +11:00
Tim Nagel
7bc88494a1
Merge branch '3.0.x'
2015-01-27 08:21:57 +11:00
Tim Nagel
30d52bf0f0
Merge pull request #782 from allanbrault/patch-1
...
Update PopulateCommand.php
2015-01-27 08:08:31 +11:00
Allan Brault
58eed2dc7f
Update PopulateCommand.php
...
in the case i have 110 objects, it was doing :
Populating abc/Index 90.9% (100/110)
Populating abc/index 181.8% (200/110)
now :
Populating abc/Index 90.9% (100/110)
Populating abc/index 100.0% (110/110)
2015-01-26 16:59:55 +01:00
Tim Nagel
d44525f6f3
Merge pull request #780 from merk/pr/770
...
Continued work on ProgressBar
2015-01-25 19:54:53 +11:00
Tim Nagel
67c0b79505
Tidy up ProgressBar use, move most calculations for loggerClosure
...
into PopulateCommand rather than in AbstractProvider
2015-01-25 19:53:58 +11:00