Merge branch '1.3.x'

Conflicts:
	Changelog.md
	README.markdown
	Resources/config/validation.xml

Author: stof

Changelog.md

@@ -9,6 +9,15 @@ Changelog
 * [BC break] Changed Datetime properties of default User entity that were nullable to default to null when no value supplied
 * [BC break] Updated schema.xml for Propel BaseUser class to allow nullable and typehint accordingly
 
+### 1.3.3 (2013-09-23)
+
+* Added a max length validation on the password
+
+### 1.3.2 (2013-05-25)
+
+* Changed the flash message handling to use the non-deprecated api
+* Updated the composer constraint to allow Symfony 2.3
+
 ### 1.3.1 (2012-12-22)
 
 * Replaced the deprecated validation constraints by the new ones

Resources/config/validation.xml

@@ -64,6 +64,7 @@
             </constraint>
             <constraint name="Length">
                 <option name="min">2</option>
+                <option name="max">4096</option>
                 <option name="minMessage">fos_user.password.short</option>
                 <option name="groups">
                     <value>Registration</value>
@@ -153,6 +154,7 @@
             </constraint>
             <constraint name="Length">
                 <option name="min">2</option>
+                <option name="max">4096</option>
                 <option name="minMessage">fos_user.password.short</option>
                 <option name="groups">
                     <value>Registration</value>

Resources/doc/overriding_templates.md

@@ -84,7 +84,7 @@ application.
 The easiest way to override a bundle's template is to simply place a new one in
 your `app/Resources` folder. To override the layout template located at
 `Resources/views/layout.html.twig` in the `FOSUserBundle` directory, you would place
-you new layout template at `app/Resources/FOSUserBundle/views/layout.html.twig`.
+your new layout template at `app/Resources/FOSUserBundle/views/layout.html.twig`.
 
 As you can see the pattern for overriding templates in this way is to
 create a folder with the name of the bundle class in the `app/Resources` directory.

Resources/translations/FOSUserBundle.ja.yml

@@ -60,7 +60,7 @@ resetting:
     password_already_requested: このユーザーのパスワードは 24 時間以内ですでにリクエストされています。
     check_email: %email% 宛にメールを送信しました。メールに記載された確認 URL にアクセスして、アカウントを有効化してください。
     request:
-        invalid_username: "\"%username%\" というユーザー名またはメールアドレスは存在しません。"
+        invalid_username: '"%username%" というユーザー名またはメールアドレスは存在しません。'
         username: "ユーザー名かメールアドレス:"
         submit: パスワードのリセット
     reset: