Merge jQuery branch, resolve conflicts

2011-12-13 15:15:57 +01:00
parent d44140a212 b27067371d
commit bb3b9e4090
13 changed files with 168 additions and 100 deletions
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -29,15 +29,7 @@ class RegistrationForm(wtforms.Form):
    password = wtforms.PasswordField(
        _('Password'),
        [wtforms.validators.Required(),
-         wtforms.validators.Length(min=6, max=30),
-         wtforms.validators.EqualTo(
-                'confirm_password',
-                _('Passwords must match.'))])
-    confirm_password = wtforms.PasswordField(
-        _('Confirm password'),
-        [wtforms.validators.Required()],
-        description=_(
-            u"Type it again here to make sure there are no spelling mistakes."))
+         wtforms.validators.Length(min=6, max=30)])
    email = wtforms.TextField(
        _('Email address'),
        [wtforms.validators.Required(),