diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-11-13 15:08:04 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-11-13 15:08:04 +0100 |
| commit | a55b65699aea8ef7ee998ed36c8c6a3b125d504c (patch) | |
| tree | 7dc1916cf0c82a6590caa2e275875f01f7dcd058 | |
| parent | a46aea9710aceb5d10aabf0d56af2500dc4bbced (diff) | |
| parent | 40aa7214a62d9ccf45ea2c92a3f0489b87f4c627 (diff) | |
| download | symfony-security-a55b65699aea8ef7ee998ed36c8c6a3b125d504c.zip symfony-security-a55b65699aea8ef7ee998ed36c8c6a3b125d504c.tar.gz symfony-security-a55b65699aea8ef7ee998ed36c8c6a3b125d504c.tar.bz2 | |
Merge branch '2.1'
* 2.1: (24 commits)
forced Travis to use source to workaround their not-up-to-date Composer on PHP 5.3.3
[Routing] removed irrelevant string cast in Route
Fixed typo
Make YamlFileLoader and XmlFileLoader file loading extensible
[HttpKernel] fix typo
Fixed singularization of "prices"
[Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc.
[HttpKernel] fixed Client when using StreamedResponses (closes #5370)
fixed PDO session handler for Oracle (closes #5829)
[HttpFoundation] fixed PDO session handler for Oracle (closes #5829)
[Locale] removed a check that is done too early (and it is done twice anyways)
Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
Adding new localized strings for farsi validation.
[HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937)
[Form] Fixed forms not to be marked invalid if their children are already marked invalid
[Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
added missing tests from previous merge
[Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
Fix export-ignore on Windows
Show correct class name InputArgument in error message
...
Conflicts:
.travis.yml
src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index e742c9b..8048151 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -Tests/ export-ignore +/Tests export-ignore phpunit.xml.dist export-ignore |