MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow login with email or username

This commit is contained in:
Eliot Berriot 2018-02-24 14:27:50 +01:00
parent a14e0acbe9
commit 0ed3f68305
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/config/settings/common.py
View File

@ -264,7 +264,7 @@ AUTHENTICATION_BACKENDS = (
) )
# Some really nice defaults # Some really nice defaults
ACCOUNT_AUTHENTICATION_METHOD = 'username' ACCOUNT_AUTHENTICATION_METHOD = 'username_email'
ACCOUNT_EMAIL_REQUIRED = True ACCOUNT_EMAIL_REQUIRED = True
ACCOUNT_EMAIL_VERIFICATION = 'mandatory' ACCOUNT_EMAIL_VERIFICATION = 'mandatory'

4
front/src/components/auth/Login.vue
View File

@ -12,13 +12,13 @@
</ul> </ul>
</div> </div>
<div class="field"> <div class="field">
<label>Username</label> <label>Username or email</label>
<input <input
ref="username" ref="username"
required required
type="text" type="text"
autofocus autofocus
placeholder="Enter your username" placeholder="Enter your username or email"
v-model="credentials.username" v-model="credentials.username"
> >
</div> </div>