Bernhard Schussek
0cf8cc762a
Merge remote branch 'symfony/master' into experimental
...
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
2011-04-04 15:16:08 +02:00
Fabien Potencier
9fe9d80371
[MonologBundle] fixed typo
2011-04-04 14:56:42 +02:00
Fabien Potencier
7be61bd72a
updated UPDATE file
2011-04-04 12:45:31 +02:00
Fabien Potencier
117b6997b4
[WebProfilerBundle] removed redundant info
2011-04-04 12:45:25 +02:00
Fabien Potencier
5bd2b53cb8
[ZendBundle] removed the bundle
2011-04-04 12:41:27 +02:00
Fabien Potencier
01ee1bfed1
merged stof/monolog
2011-04-04 12:29:15 +02:00
Fabien Potencier
f4276a88f6
Merge remote branch 'schmittjoh/parameterCleanup'
...
* schmittjoh/parameterCleanup:
[SecurityBundle] inline parameters which are only used in one place
[SecurityBundle] moved all non-class parameters to the Configuration file
2011-04-04 11:57:31 +02:00
Fabien Potencier
1cb03b1448
[FrameworkBundle] removed templating.loader.cache.path parameter
2011-04-04 11:56:41 +02:00
Fabien Potencier
1fd44ea736
Merge remote branch 'vicb/cache_template'
...
* vicb/cache_template:
[FrameworkBundle] Fix the cache template loader
2011-04-04 11:49:13 +02:00
Fabien Potencier
7ff4e54748
updated UPDATE
2011-04-04 11:44:58 +02:00
Fabien Potencier
49a7f525b9
Revert "[FrameworkBundle] Updated the files generated by init:bundle to use the new bundle logical names"
...
This reverts commit d0e2b5b611
.
2011-04-04 11:42:52 +02:00
Fabien Potencier
a60a9af53f
updated UPDATE
2011-04-04 11:36:28 +02:00
Fabien Potencier
f232b3cdda
reverted Merge remote branch 'kriswallsmith/kernel/shorter-bundle-names'
2011-04-04 11:10:56 +02:00
Fabien Potencier
743592d81e
Revert "fixed remaining Bundle suffixes"
...
This reverts commit 315147c6c8
.
2011-04-04 11:08:56 +02:00
Fabien Potencier
c80ade9dc7
Revert "[DoctrineBundle] updated tests with shorter bundle names"
...
This reverts commit 082fd73b3c
.
2011-04-04 11:08:50 +02:00
Fabien Potencier
c1715ef376
Revert "[DoctrineMongoDBBundle] updated tests with shorter bundle names"
...
This reverts commit 751ba4db5e
.
2011-04-04 11:08:43 +02:00
Fabien Potencier
6a5356290a
Revert "[HttpKernel] updated tests for shorter bundle names"
...
This reverts commit fb7e87da7d
.
2011-04-04 11:08:37 +02:00
Fabien Potencier
6c2954a2d5
Revert "[FrameworkBundle] fixed shorter bundle name in test"
...
This reverts commit d1f3852868
.
2011-04-04 11:08:30 +02:00
Fabien Potencier
b442f58f02
Merge remote branch 'FabienPennequin/assetic_update.md'
...
* FabienPennequin/assetic_update.md:
Updated file UPDATE.md for assetic filters
2011-04-04 11:02:07 +02:00
Fabien Potencier
06c1e02bed
Merge remote branch 'Seldaek/serializer'
...
* Seldaek/serializer:
[Serializer] Some more privates
[Serializer] Move private methods below protected ones
[Serializer] Added @api annotations
[Serializer] Added docblocks for NormalizableInterface
[Serializer] add methods to the SerializerInterface
[Serializer] Added docblock
[Serializer] Switched most protected to private or final
2011-04-04 11:01:41 +02:00
Fabien Potencier
9b16287bcd
Merge remote branch 'Seldaek/ajax_redir'
...
* Seldaek/ajax_redir:
[WebProfilerBundle] Prevent redirects to be intercepted in XHRs
2011-04-04 11:01:12 +02:00
Fabien Potencier
514133a6bb
[Console] made ApplicationTester::getDisplay() work even in case of an error during execution and changed returned value of ApplicationTester to the command exit code
2011-04-03 23:46:08 +02:00
Fabien Potencier
dd158a2c99
[Console] made CommandTester::getDispaly() work even in case of an error during execution
2011-04-03 23:25:59 +02:00
Fabien Potencier
ad4a0bda1c
[Console] changed returned value of CommandTester to the command exit code
2011-04-03 22:30:40 +02:00
Fabien Potencier
91a2f36850
[DomCrawler] fixed typo in phpdoc
2011-04-03 22:23:52 +02:00
Jordi Boggiano
21b3ee6783
[WebProfilerBundle] Prevent redirects to be intercepted in XHRs
2011-04-03 21:21:23 +02:00
Jordi Boggiano
a16f1865b5
[WebProfilerBundle] Display errors logged by monolog properly in logger panel
2011-04-03 16:36:04 +02:00
Jordi Boggiano
7132f81d14
[Serializer] Some more privates
2011-04-03 16:24:25 +02:00
Jordi Boggiano
47733d08a1
[Serializer] Move private methods below protected ones
2011-04-03 16:21:53 +02:00
Jordi Boggiano
54ffb1fbc0
[Serializer] Added @api annotations
2011-04-03 15:49:40 +02:00
Jordi Boggiano
507f6269b5
[Serializer] Added docblocks for NormalizableInterface
2011-04-03 15:44:09 +02:00
Jordi Boggiano
76cab7deb9
[Serializer] add methods to the SerializerInterface
2011-04-03 15:15:53 +02:00
Jordi Boggiano
cb727dbde3
[Serializer] Added docblock
2011-04-03 15:14:07 +02:00
Jordi Boggiano
424a1dad27
[Serializer] Switched most protected to private or final
2011-04-03 15:13:21 +02:00
Fabien Pennequin
34c6dbf5d2
Updated file UPDATE.md for assetic filters
2011-04-03 12:04:31 +02:00
Victor Berchet
788ed5126b
[FrameworkBundle] Fix the cache template loader
2011-04-02 19:18:32 +02:00
Fabien Potencier
5d143c4aac
Merge remote branch 'weaverryan/prevent_exception_on_handle_exception'
...
* weaverryan/prevent_exception_on_handle_exception:
[HttpKernel] Wrapping the end of handleException() in a try-catch to prevent response listeners from throwing another exception
2011-04-02 18:40:34 +02:00
Fabien Potencier
53274512e2
Merge remote branch 'weaverryan/better_import_exception_and_bug_fix'
...
* weaverryan/better_import_exception_and_bug_fix:
[Config] Improving the exception when a resource cannot be imported
[DependencyInjection] Fixing a bug where "ignore_errors" doesn't work in YAML and XML
2011-04-02 18:37:51 +02:00
Fabien Potencier
e92ac9eeef
Merge remote branch 'weaverryan/exception_page_changes'
...
* weaverryan/exception_page_changes:
[FrameworkBundle] When there are multiple nested exceptions, this hides the stacktrace from all exceptions by default
[FrameworkBundle] Fixing small bug on exception page where the +/- icons didn't toggle correctly
2011-04-02 18:33:55 +02:00
Bernhard Schussek
72a41f8c94
[Form] Fixed: Booleans can be used as choice keys now
2011-04-02 18:26:28 +02:00
Fabien Potencier
1cd9b5bb49
Merge remote branch 'kriswallsmith/assetic/updates'
...
* kriswallsmith/assetic/updates:
[AsseticBundle] added twig support for asset packages
[AsseticBundle] cleaned up php templating support
[FrameworkBundle] fixed interface and usage in RouterHelper
[AsseticBundle] fixed twig classes for api changes in assetic
2011-04-02 18:15:45 +02:00
Fabien Potencier
0667e706fe
Merge remote branch 'kriswallsmith/assetic/config-fixes'
...
* kriswallsmith/assetic/config-fixes:
[AsseticBundle] moved some parameter defaults to Configuration
[AsseticBundle] fixed definition of filter configs
2011-04-02 18:15:43 +02:00
Fabien Potencier
336a184bb4
Merge remote branch 'kriswallsmith/assetic/coalesce-dirs'
...
* kriswallsmith/assetic/coalesce-dirs:
[AsseticBundle] added coalescing directory resources that check the kernel for bundle templates
2011-04-02 18:15:41 +02:00
Bernhard Schussek
a5d0b3aea6
[Form] Changed FormBuilder::set(Client|Norm)Transformer to FormBuilder::prepend(Client|Norm)Transformer and FormBuilder::append(Client|Norm)Transformer to facilitate extension of types
2011-04-02 16:39:19 +02:00
Bernhard Schussek
be9ef42af9
[Form] Renamed choice transformers for better clarity
2011-04-02 16:11:20 +02:00
Bernhard Schussek
fc59936740
[Form] Fixed: ThemeRenderer::isChoiceSelected() works correctly for boolean choices
2011-04-02 16:00:46 +02:00
Bernhard Schussek
a4bbc40ac6
[Form] Cleaned up ChoiceListInterface
2011-04-02 15:41:43 +02:00
Pascal Borreli
8a82aee56f
[Locale][Windows] Fixing tests for old ICU version (default in php.net packages)
2011-04-02 13:19:30 +00:00
Bernhard Schussek
d3b7c4e8c1
[Form] Moved getLabel(), isChoiceSelected() and isChoiceGroup() from ChoiceListInterface to ThemeRenderer
2011-04-02 14:14:18 +02:00
Bernhard Schussek
d3c8647f49
[Form] Fixed EntitiesToArrayTransformer::reverseTransform() to accept NULL values
2011-04-02 14:13:16 +02:00