Merge origin/main into bugfix/rund-seeds-just-once
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Resolved conflicts: - CHANGELOG.md: keep FORCE_SEEDS and Seeds entries, keep OIDC/Unauthenticated from main - auth_controller.ex: use sign_in_path_after_oidc_failure() for OIDC-only redirect - oidc_only_sign_in_redirect.ex: take main's oidc_failed=1 handling - gettext default.po: remove obsolete #~ block - auth_controller_test.exs: keep test for oidc_failed=1 redirect loop Made-with: Cursor
This commit is contained in:
commit
28c40ec2a9
9 changed files with 108 additions and 39 deletions
|
|
@ -3905,8 +3905,3 @@ msgstr "Nur OIDC-Anmeldung ist aktiv. Diese Option ist deaktiviert."
|
|||
#, elixir-autogen, elixir-format
|
||||
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
|
||||
msgstr "Nur Anmeldung per Single Sign-On (SSO) ist erlaubt."
|
||||
|
||||
#~ #: lib/accounts/user/validations/oidc_only_blocks_password_registration.ex
|
||||
#~ #, elixir-autogen, elixir-format
|
||||
#~ msgid "Registration with password is disabled when only OIDC sign-in is active."
|
||||
#~ msgstr "Registrierung mit Passwort ist deaktiviert, wenn nur OIDC-Anmeldung aktiv ist."
|
||||
|
|
|
|||
|
|
@ -3905,8 +3905,3 @@ msgstr ""
|
|||
#, elixir-autogen, elixir-format
|
||||
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
|
||||
msgstr ""
|
||||
|
||||
#~ #: lib/accounts/user/validations/oidc_only_blocks_password_registration.ex
|
||||
#~ #, elixir-autogen, elixir-format
|
||||
#~ msgid "Registration with password is disabled when only OIDC sign-in is active."
|
||||
#~ msgstr "Registration with password is disabled when only OIDC sign-in is active."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue