diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-02-11 08:17:51 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-02-11 08:17:51 +0100 |
commit | 6fa94f258d7739d5b5c6063716725204c6745a87 (patch) | |
tree | b98e9d3cf3c32a582066c85e42a7385180d03b80 /Http/EntryPoint/DigestAuthenticationEntryPoint.php | |
parent | 7efc95077540fd649e1dbd98fb498461be1254ca (diff) | |
parent | a8d995fac4ccf99e34db97ea252cc993382ac83e (diff) | |
download | symfony-security-6fa94f258d7739d5b5c6063716725204c6745a87.zip symfony-security-6fa94f258d7739d5b5c6063716725204c6745a87.tar.gz symfony-security-6fa94f258d7739d5b5c6063716725204c6745a87.tar.bz2 |
Merge branch '2.6' into 2.7
* 2.6: (21 commits)
[FrameworkBundle] Fix title and placeholder rendering in php form templates.
[TwigBridge] Removed duplicated code from TwigRenderer
[Translator][Logging] implement TranslatorBagInterface.
RequestDataCollector - small fix
renamed composer.phar to composer to be consistent with the Symfony docs
[FrameworkBundle] bumped min version of Routing to 2.3
removed composer --dev option everywhere
fixed a test
[Console] Fixed output bug, if escaped string in a formatted string.
“console help” ignores --raw option
Fix form icon position in web profiler
[Security] Remove ContextListener's onKernelResponse listener as it is used
Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
Revert "fixed assertion"
fixed assertion
[HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
fixed URL
Add reference to documentation in FormEvents phpdocs
[YAML] Fix one-liners to work with multiple new lines
Keep "pre" meaning for var_dump quick-and-dirty debug
...
Conflicts:
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Component/Security/Http/Firewall/ContextListener.php
src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
Diffstat (limited to 'Http/EntryPoint/DigestAuthenticationEntryPoint.php')
0 files changed, 0 insertions, 0 deletions