[stable31] refactor(admin): 2FA chapter clean-up #12923
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
- Document the three bundled (shipped) 2FA providers. - Clarify what "providers" are and why they're important. - Re-order the sections. - Remove some outdated bits. - Eliminate some redundancies. - Misc tidying up. Signed-off-by: Josh <[email protected]>
kesselb
force-pushed
the
backport/12446/stable31
branch
from
a5318f4 to
8bf3410
Compare
Signed-off-by: Ferdinand Thiessen <[email protected]>
kesselb
force-pushed
the
backport/12446/stable31
branch
from
8bf3410 to
aa37ad2
Compare
|
Hi @joshtrichards @susnux, the backport for 30 is in, and therefore I reapplied the commits and resolves the conflicts. Could you please take a brief look if verything's all right? |
susnux
approved these changes
Jul 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #12446
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.