Fabien Potencier
56b0139b0d
Merge branch '2.3' into 2.4
...
* 2.3:
Validate locales sets intos translator
Fix UserPassword validator translation
Remove Spaceless Blocks from Twig Form Templates
fixed typo
[HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
added regression test
fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval
[HttpFoundation] Fix wrong assertion in Response test
[Upgrade] Fixed markdown syntax
[2.3][Form] Cleanup & fix phpdocs
Conflicts:
src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
2014-07-15 16:07:10 +02:00
Fabien Potencier
ea45769aab
fixed typo
2014-07-11 11:32:34 +02:00
Fabien Potencier
d5bd9bdd68
Merge branch '2.3' into 2.4
...
* 2.3:
fixed types in phpdocs
Conflicts:
src/Symfony/Bridge/Twig/TwigEngine.php
src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Stopwatch/StopwatchEvent.php
src/Symfony/Component/Templating/PhpEngine.php
2014-04-16 12:34:31 +02:00
Fabien Potencier
e96b018805
fixed types in phpdocs
2014-04-16 12:30:19 +02:00
Tobias Schultze
111ac18232
unify constructor initialization style throughout symfony
2013-11-11 19:40:07 +01:00
Fabien Potencier
e3421a0b1d
[DoctrineBridge] fixed some CS
2011-12-13 10:22:12 +01:00
Fabien Potencier
8c423edfef
replaced symfony-project.org by symfony.com
2011-03-06 12:40:06 +01:00
Fabien Potencier
d0b4bfc8f6
added a cache warmer sub-framework
...
Cache warmer will come in the next commits.
To warm up the cache on a production server, you can use
the cache:warmup command:
./app/console_prod cache:warmup
2011-01-24 18:08:51 +01:00
