darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-08 22:13:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/GSA/notifications-admin into 686-remove-uk-styles

Browse Source 
# Conflicts:
#	app/assets/stylesheets/main.scss
#	app/templates/views/find-users/user-information.html
#	app/templates/views/two-factor-webauthn.html
#	app/templates/views/user-profile/manage-security-key.html
#	app/templates/views/user-profile/security-keys.html
#	gulpfile.js
This commit is contained in:
Jonathan Bobel
2023-08-15 13:29:39 -04:00
parent 6b22c347da 01c18c9624
commit d66ff27bae
41 changed files with 337 additions and 2340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/sign_in.py
View File

@@ -59,8 +59,6 @@ def sign_in():
return redirect(url_for('.two_factor_sms', next=redirect_url))
if user.email_auth:
return redirect(url_for('.two_factor_email_sent', next=redirect_url))
if user.webauthn_auth:
return redirect(url_for('.two_factor_webauthn', next=redirect_url))
# Vague error message for login in case of user not known, locked, inactive or password not verified
flash(Markup(