heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into merge-python3-port

Browse Source 
Has some issues, will iteratively fix!

Conflicts:
	mediagoblin/gmg_commands/__init__.py
	mediagoblin/gmg_commands/deletemedia.py
	mediagoblin/gmg_commands/users.py
	mediagoblin/oauth/views.py
	mediagoblin/plugins/api/views.py
	mediagoblin/tests/test_api.py
	mediagoblin/tests/test_edit.py
	mediagoblin/tests/test_oauth1.py
	mediagoblin/tests/test_util.py
	mediagoblin/tools/mail.py
	mediagoblin/webfinger/views.py
	setup.py
This commit is contained in:
Christopher Allan Webber
2014-09-16 14:01:43 -05:00
parent 5b64c92e08 1b4e199668
commit f6bad0eb26
215 changed files with 50324 additions and 10613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/plugins/ldap/forms.py
View File

@@ -22,19 +22,19 @@ from mediagoblin.auth.tools import normalize_user_or_email_field
class RegisterForm(wtforms.Form):
username = wtforms.HiddenField(
'',
[wtforms.validators.Required(),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_email=False)])
email = wtforms.TextField(
_('Email address'),
[wtforms.validators.Required(),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field(allow_user=False)])
class LoginForm(wtforms.Form):
username = wtforms.TextField(
_('Username'),
[wtforms.validators.Required(),
[wtforms.validators.InputRequired(),
normalize_user_or_email_field()])
password = wtforms.PasswordField(
_('Password'),
[wtforms.validators.Required()])
[wtforms.validators.InputRequired()])