Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow any user to manage two-factor #16130

Merged
merged 33 commits into from
May 28, 2024
Merged

Allow any user to manage two-factor #16130

merged 33 commits into from
May 28, 2024

Commits on May 21, 2024

  1. Allow any user to manage two-factor

    @MikeAlhayek
    MikeAlhayek committed May 21, 2024
    Configuration menu
    Copy the full SHA
    0cdf97d View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge branch 'main' into ma/fix-2fa-admin-attribute

    @MikeAlhayek
    MikeAlhayek authored May 22, 2024
    Configuration menu
    Copy the full SHA
    b2666ce View commit details
    Browse the repository at this point in the history

  2. Use email confirmation for 2FA

    @MikeAlhayek
    MikeAlhayek committed May 22, 2024
    Configuration menu
    Copy the full SHA
    f82fe05 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ma/fix-2fa-admin-attribute' of https://github.com/Orcha… 

    …rdCMS/OrchardCore into ma/fix-2fa-admin-attribute
    @MikeAlhayek
    MikeAlhayek committed May 22, 2024
    Configuration menu
    Copy the full SHA
    9a860a2 View commit details
    Browse the repository at this point in the history

  4. cleanup

    @MikeAlhayek
    MikeAlhayek committed May 22, 2024
    Configuration menu
    Copy the full SHA
    84be641 View commit details
    Browse the repository at this point in the history

  5. document the breaking change

    @MikeAlhayek
    MikeAlhayek committed May 22, 2024
    Configuration menu
    Copy the full SHA
    aa62415 View commit details
    Browse the repository at this point in the history

  6. Fix tests

    @MikeAlhayek
    MikeAlhayek committed May 22, 2024
    Configuration menu
    Copy the full SHA
    a0ea4fd View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. address feedback

    @MikeAlhayek
    MikeAlhayek committed May 24, 2024
    Configuration menu
    Copy the full SHA
    c15e1d5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into ma/fix-2fa-admin-attribute

    @MikeAlhayek
    MikeAlhayek authored May 24, 2024
    Configuration menu
    Copy the full SHA
    3dddeb0 View commit details
    Browse the repository at this point in the history

  3. Fix build

    @MikeAlhayek
    MikeAlhayek committed May 24, 2024
    Configuration menu
    Copy the full SHA
    5b91f72 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ma/fix-2fa-admin-attribute' of https://github.com/Orcha… 

    …rdCMS/OrchardCore into ma/fix-2fa-admin-attribute
    @MikeAlhayek
    MikeAlhayek committed May 24, 2024
    Configuration menu
    Copy the full SHA
    ac57bc4 View commit details
    Browse the repository at this point in the history

  5. docs

    @MikeAlhayek
    MikeAlhayek committed May 24, 2024
    Configuration menu
    Copy the full SHA
    4415a69 View commit details
    Browse the repository at this point in the history

  6. Use Layout-TwoFactor instead of changing the AdminAttribute

    @MikeAlhayek
    MikeAlhayek committed May 24, 2024
    Configuration menu
    Copy the full SHA
    a8810a6 View commit details
    Browse the repository at this point in the history

  7. fix settings driver

    @MikeAlhayek
    MikeAlhayek committed May 24, 2024
    Configuration menu
    Copy the full SHA
    f04b3f4 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into ma/fix-2fa-admin-attribute

    @MikeAlhayek
    MikeAlhayek authored May 24, 2024
    Configuration menu
    Copy the full SHA
    bdc5b42 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. Prevent a breaking change

    @MikeAlhayek
    MikeAlhayek committed May 25, 2024
    Configuration menu
    Copy the full SHA
    5bc5bbe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into ma/fix-2fa-admin-attribute

    @MikeAlhayek
    MikeAlhayek authored May 25, 2024
    Configuration menu
    Copy the full SHA
    9189352 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. address feedback

    @MikeAlhayek
    MikeAlhayek committed May 26, 2024
    Configuration menu
    Copy the full SHA
    3b35ba9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into ma/fix-2fa-admin-attribute

    @MikeAlhayek
    MikeAlhayek authored May 26, 2024
    Configuration menu
    Copy the full SHA
    d9a83f9 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Merge branch 'main' into ma/fix-2fa-admin-attribute

    @MikeAlhayek
    MikeAlhayek authored May 27, 2024
    Configuration menu
    Copy the full SHA
    9fb580c View commit details
    Browse the repository at this point in the history

  2. remove email authenticator controller

    @MikeAlhayek
    MikeAlhayek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    7c6a0c5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ma/fix-2fa-admin-attribute' of https://github.com/Orcha… 

    …rdCMS/OrchardCore into ma/fix-2fa-admin-attribute
    @MikeAlhayek
    MikeAlhayek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    56256c4 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/main' into ma/fix-2fa-admin-attr… 

    …ibute

# Conflicts:
#	src/OrchardCore.Modules/OrchardCore.Users/Controllers/EmailAuthenticatorController.cs
#	src/OrchardCore.Modules/OrchardCore.Users/TwoFactorAuthenticationStartup.cs
    @MikeAlhayek
    MikeAlhayek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    ed5fd2e View commit details
    Browse the repository at this point in the history

  5. cleanup

    @MikeAlhayek
    MikeAlhayek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    846537a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into ma/fix-2fa-admin-attribute

    @MikeAlhayek
    MikeAlhayek authored May 27, 2024
    Configuration menu
    Copy the full SHA
    ea8204f View commit details
    Browse the repository at this point in the history

  7. Fix filter

    @MikeAlhayek
    MikeAlhayek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    28635b6 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into ma/fix-2fa-admin-attribute

    @MikeAlhayek
    MikeAlhayek authored May 27, 2024
    Configuration menu
    Copy the full SHA
    b6a6925 View commit details
    Browse the repository at this point in the history

  9. cleanup

    @MikeAlhayek
    MikeAlhayek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    7542d66 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ma/fix-2fa-admin-attribute' of https://github.com/Orcha… 

    …rdCMS/OrchardCore into ma/fix-2fa-admin-attribute
    @MikeAlhayek
    MikeAlhayek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    97bba26 View commit details
    Browse the repository at this point in the history

  11. Update src/OrchardCore/OrchardCore.Admin.Abstractions/AdminPermission… 

    …s.cs

Co-authored-by: Zoltán Lehóczky <[email protected]>
    @MikeAlhayek @Piedone
    MikeAlhayek and Piedone authored May 27, 2024
    Configuration menu
    Copy the full SHA
    7b42e70 View commit details
    Browse the repository at this point in the history

  12. change fontawesome placement

    @MikeAlhayek
    MikeAlhayek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    e98a6d3 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'ma/fix-2fa-admin-attribute' of https://github.com/Orcha… 

    …rdCMS/OrchardCore into ma/fix-2fa-admin-attribute
    @MikeAlhayek
    MikeAlhayek committed May 27, 2024
    Configuration menu
    Copy the full SHA
    3f9c1d2 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. fix layout

    @MikeAlhayek
    MikeAlhayek committed May 28, 2024
    Configuration menu
    Copy the full SHA
    06e6cec View commit details
    Browse the repository at this point in the history