darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 18:08:25 -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

6
app/templates/views/manage-users/permissions.html
View File

@@ -11,11 +11,7 @@
{% endif %}
{% if service_has_email_auth %}
{% if user.webauthn_auth %}
<p class="bottom-gutter govuk-body">
This user will login with a security key.
</p>
{% elif not mobile_number %}
{% if not mobile_number %}
{{ radios(
form.login_authentication,
disable=['sms_auth'],