Merge branch 'main' into passkey-login

# Conflicts:
#	src/auth.rs
This commit is contained in:
Daniel García committed 2026-11-18 22:38:33 +01:00
commit 29765121b7
61 files changed
+1480 -1646

No files matched your search

@@ -105,9 +105,8 @@ app-security > app-two-factor-setup > form {
/* Hide unsupported Custom Role options */
{{#if custom_roles_enabled}}
/* Not supported: Manage SSO and Manage account recovery */
:is(bit-dialog, [bit-dialog]) bit-form-control:has(input[formcontrolname="manageSso"]),
:is(bit-dialog, [bit-dialog]) bit-form-control:has(input[formcontrolname="manageResetPassword"]) {
/* Not supported: Manage SSO */
:is(bit-dialog, [bit-dialog]) bit-form-control:has(input[formcontrolname="manageSso"]) {
@extend %vw-hide;
}
{{else}}