diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-25 05:42:01 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-25 05:42:01 +0100 |
| commit | 868fb240c232522937df01ac2e2e2516c13000c7 (patch) | |
| tree | 8a718ac08aff7a9a161f0a3b1777706a84dfbf5e /Core/Encoder | |
| parent | b558f6f9a456c2aae4d9f6260122fa348d9df1cd (diff) | |
| parent | 9c940b6c6a370250a31b00664c088bb14d9e696f (diff) | |
| download | symfony-security-868fb240c232522937df01ac2e2e2516c13000c7.zip symfony-security-868fb240c232522937df01ac2e2e2516c13000c7.tar.gz symfony-security-868fb240c232522937df01ac2e2e2516c13000c7.tar.bz2 | |
Merge branch '2.7'
* 2.7:
fixed tests
[OptionsResolver] replaced some exception messages
Added i18n support to ConfirmationQuestion
[HttpKernel] [WebProfilerBundle] added HTTP status to profiler search result
[Form] fixed form tests when using 2.7 deps
[2.3] [HttpFoundation] [MimeTypeGuesser]
[Routing] merge instead of replace class and method scheme/method annotations
[TwigBridge] Fix bootstrap rendering when user explicitly use form_label
Removed dead code and various cleaning
Removed dead code and various cleaning
Fixed HtmlDumper with long string
Removed dead code and various cleaning
[FrameworkBundle][xsd] added missing logging attribute.
[Console] Make it clear that the second argument is not about command options.
Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
[Yaml] fixed parse shortcut Key after unindented collection.
[Console] fixed #10531
Make the container considered non-fresh if the environment parameters are changed
Conflicts:
src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
src/Symfony/Component/HttpKernel/CHANGELOG.md
src/Symfony/Component/Process/Process.php
Diffstat (limited to 'Core/Encoder')
0 files changed, 0 insertions, 0 deletions