diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-02 17:21:08 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-02 17:21:08 +0200 |
commit | bc667cc8328a48cf58923a9dd2bfbb83be66c9cd (patch) | |
tree | fbf81f32dd781acea7f3b4e50551936e77818b94 /Http/RememberMe | |
parent | c17ff740851d23d48e26ff922b45d0c695081015 (diff) | |
parent | 588fe277b5b8319708a1afddb6e53cfcfdfa2281 (diff) | |
download | symfony-security-bc667cc8328a48cf58923a9dd2bfbb83be66c9cd.zip symfony-security-bc667cc8328a48cf58923a9dd2bfbb83be66c9cd.tar.gz symfony-security-bc667cc8328a48cf58923a9dd2bfbb83be66c9cd.tar.bz2 |
Merge branch '2.6' into 2.7
* 2.6: (25 commits)
[2.6] link to https://symfony.com where possible
Do not override PHP constants, only use when available
link to https://symfony.com where possible
[FrameworkBundle] Added missing log in server:run command
[Finder] Only use GLOB_BRACE when available
[HttpFoundation] Allow curly braces in trusted host patterns
Fix merge
Fix typo in variable name
[profiler][security] check authenticated user by tokenClass instead of username.
[WebProfiler] fix html syntax for input types
[TwigBundle] Fix deprecated use of FlattenException
[DependencyInjection] Removed extra strtolower calls
Use https://symfony.com/search for searching
[Debug] PHP7 compatibility with BaseException
[Validator] Fixed Choice when an empty array is used in the "choices" option
Fixed tests
[StringUtil] Fixed singularification of 'selfies'
Fix Portuguese (Portugal) translation for Security
improved exception when missing required component
[DependencyInjection] resolve circular reference
...
Conflicts:
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
src/Symfony/Component/Form/README.md
src/Symfony/Component/Intl/README.md
src/Symfony/Component/Security/README.md
src/Symfony/Component/Translation/README.md
src/Symfony/Component/Validator/README.md
Diffstat (limited to 'Http/RememberMe')
0 files changed, 0 insertions, 0 deletions