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

fix: allow reset_otp_secret only if Two Factor Auth is enabled (backport #20506) #20560

Merged
merged 2 commits into from
Apr 11, 2023
Merged

fix: allow reset_otp_secret only if Two Factor Auth is enabled (backport #20506) #20560

merged 2 commits into from
Apr 11, 2023

Commits on Apr 3, 2023

  1. fix: allow reset_otp_secret only if Two Factor Auth is enabled (#20506 

    )

* fix: display `Reset OTP Secret` button only if Two factor Auth is enabled

* fix: added validations and fetched value from cached doc

* fix: linter changes

(cherry picked from commit 06580bd)

# Conflicts:
#	frappe/core/doctype/user/user.js
#	frappe/twofactor.py
    @DaizyModi @mergify
    DaizyModi authored and mergify[bot] committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    d378256 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. chore: conflicts

    @ankush
    ankush committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    832afcc View commit details
    Browse the repository at this point in the history