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 | |
| 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
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | Resources/translations/security.pt_PT.xlf | 6 | ||||
| -rw-r--r-- | composer.json | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -11,7 +11,7 @@ Resources Documentation: -http://symfony.com/doc/2.7/book/security.html +https://symfony.com/doc/2.7/book/security.html Tests ----- diff --git a/Resources/translations/security.pt_PT.xlf b/Resources/translations/security.pt_PT.xlf index e661000..f2af13e 100644 --- a/Resources/translations/security.pt_PT.xlf +++ b/Resources/translations/security.pt_PT.xlf @@ -4,7 +4,7 @@ <body> <trans-unit id="1"> <source>An authentication exception occurred.</source> - <target>Ocorreu um excepção durante a autenticação.</target> + <target>Ocorreu uma excepção durante a autenticação.</target> </trans-unit> <trans-unit id="2"> <source>Authentication credentials could not be found.</source> @@ -20,7 +20,7 @@ </trans-unit> <trans-unit id="5"> <source>Cookie has already been used by someone else.</source> - <target>Este cookie já esta em uso.</target> + <target>Este cookie já está em uso.</target> </trans-unit> <trans-unit id="6"> <source>Not privileged to request the resource.</source> @@ -64,7 +64,7 @@ </trans-unit> <trans-unit id="16"> <source>Account is locked.</source> - <target>A conta esta trancada.</target> + <target>A conta está trancada.</target> </trans-unit> </body> </file> diff --git a/composer.json b/composer.json index 1c016b1..aeea64a 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "library", "description": "Symfony Security Component", "keywords": [], - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "license": "MIT", "authors": [ { @@ -12,7 +12,7 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "require": { |