diff --git a/web/src/admin/stages/invitation/InvitationForm.ts b/web/src/admin/stages/invitation/InvitationForm.ts index be110eb46..aad301e07 100644 --- a/web/src/admin/stages/invitation/InvitationForm.ts +++ b/web/src/admin/stages/invitation/InvitationForm.ts @@ -77,7 +77,7 @@ export class InvitationForm extends ModelForm { )}

- + Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -5872,10 +5873,22 @@ Bindings to groups/users are checked against the user of the event. forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + + diff --git a/web/xliff/en.xlf b/web/xliff/en.xlf index 350004edb..34c0c51e5 100644 --- a/web/xliff/en.xlf +++ b/web/xliff/en.xlf @@ -6087,6 +6087,7 @@ Bindings to groups/users are checked against the user of the event. Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -6155,10 +6156,22 @@ Bindings to groups/users are checked against the user of the event. forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + + diff --git a/web/xliff/es.xlf b/web/xliff/es.xlf index 280b7f24a..461d4502c 100644 --- a/web/xliff/es.xlf +++ b/web/xliff/es.xlf @@ -5719,6 +5719,7 @@ Bindings to groups/users are checked against the user of the event. Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -5787,10 +5788,22 @@ Bindings to groups/users are checked against the user of the event. forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + + diff --git a/web/xliff/fr.xlf b/web/xliff/fr.xlf index 0605c6d90..a309541a8 100644 --- a/web/xliff/fr.xlf +++ b/web/xliff/fr.xlf @@ -7622,6 +7622,7 @@ Les liaisons avec les groupes/utilisateurs sont vérifiées par rapport à l'uti Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -7690,10 +7691,22 @@ Les liaisons avec les groupes/utilisateurs sont vérifiées par rapport à l'uti forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + + diff --git a/web/xliff/pl.xlf b/web/xliff/pl.xlf index ea77f69c5..ab2cd304d 100644 --- a/web/xliff/pl.xlf +++ b/web/xliff/pl.xlf @@ -5927,6 +5927,7 @@ Bindings to groups/users are checked against the user of the event. Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -5995,10 +5996,22 @@ Bindings to groups/users are checked against the user of the event. forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + + diff --git a/web/xliff/pseudo-LOCALE.xlf b/web/xliff/pseudo-LOCALE.xlf index d11fc69a7..4bac06609 100644 --- a/web/xliff/pseudo-LOCALE.xlf +++ b/web/xliff/pseudo-LOCALE.xlf @@ -6022,6 +6022,7 @@ Bindings to groups/users are checked against the user of the event. Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -6090,10 +6091,22 @@ Bindings to groups/users are checked against the user of the event. forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + + diff --git a/web/xliff/tr.xlf b/web/xliff/tr.xlf index 04e17a812..faaae0a67 100644 --- a/web/xliff/tr.xlf +++ b/web/xliff/tr.xlf @@ -5712,6 +5712,7 @@ Bindings to groups/users are checked against the user of the event. Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -5780,10 +5781,22 @@ Bindings to groups/users are checked against the user of the event. forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + + diff --git a/web/xliff/zh-Hans.xlf b/web/xliff/zh-Hans.xlf index d3b54eda4..259262314 100644 --- a/web/xliff/zh-Hans.xlf +++ b/web/xliff/zh-Hans.xlf @@ -7627,6 +7627,7 @@ Bindings to groups/users are checked against the user of the event. Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -7695,10 +7696,22 @@ Bindings to groups/users are checked against the user of the event. forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + + diff --git a/web/xliff/zh-Hant.xlf b/web/xliff/zh-Hant.xlf index 581b360bb..8e61e821c 100644 --- a/web/xliff/zh-Hant.xlf +++ b/web/xliff/zh-Hant.xlf @@ -5760,6 +5760,7 @@ Bindings to groups/users are checked against the user of the event. Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -5828,10 +5829,22 @@ Bindings to groups/users are checked against the user of the event. forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + + diff --git a/web/xliff/zh_TW.xlf b/web/xliff/zh_TW.xlf index e5f56763b..bbe162b1c 100644 --- a/web/xliff/zh_TW.xlf +++ b/web/xliff/zh_TW.xlf @@ -5759,6 +5759,7 @@ Bindings to groups/users are checked against the user of the event. Stage used to configure a WebAuthn authenticator (i.e. Yubikey, FaceID/Windows Hello). +<<<<<<< HEAD Internal application name used in URLs. @@ -5827,10 +5828,22 @@ Bindings to groups/users are checked against the user of the event. forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you). +======= + + Custom attributes +>>>>>>> main Don't show this message again. - - - + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + Use this provider with nginx's auth_request or traefik's + forwardAuth. Each application/domain needs its own provider. + Additionally, on each domain, /outpost.goauthentik.io must be + routed to the outpost (when using a managed outpost, this is done for you). + + +