Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

2013-07-14 15:27:52 +01:00
parent 49a47ec991 2d0028e932
commit e49263564b
48 changed files with 395 additions and 261 deletions
--- a/mediagoblin/plugins/basic_auth/forms.py
+++ b/mediagoblin/plugins/basic_auth/forms.py
@@ -41,3 +41,6 @@ class LoginForm(wtforms.Form):
         normalize_user_or_email_field()])
    password = wtforms.PasswordField(
        _('Password'))
+    stay_logged_in = wtforms.BooleanField(
+        label='',
+        description=_('Stay logged in'))