fix: allow reset_otp_secret only if Two Factor Auth is enabled (backport #20506)
#20560
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
) * 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
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
frappe-pr-bot
pushed a commit
that referenced
this pull request
Apr 11, 2023
# [13.53.0](v13.52.0...v13.53.0) (2023-04-11) ### Bug Fixes * allow `reset_otp_secret` only if Two Factor Auth is enabled (backport [#20506](#20506)) ([#20560](#20560)) ([e8025a4](e8025a4)) * better permission error for query_report ([#20643](#20643)) ([#20646](#20646)) ([d972af8](d972af8)) * change z-index of freeze component to make it appear above all components ([1878b87](1878b87)), closes [#20538](#20538) * child row form should be above freeze screen ([9201e84](9201e84)) * client script add to instead of replace ([0c7ac16](0c7ac16)) * client_script default value ([9ed7851](9ed7851)) * german translation of workflow state ([#20609](#20609)) ([#20615](#20615)) ([3769bdf](3769bdf)) * **grid row:** fix prettier hook check ([9309687](9309687)) * **grid row:** fix update_docfield_property function not updating grid row ([558f908](558f908)) * **ListView:** Evaluate sort_field sort_order within listviews based on DocTypes Definition ([#20482](#20482)) ([ba3cf84](ba3cf84)) * log requests even if no response ([#20638](#20638)) ([#20639](#20639)) ([ae4f7dd](ae4f7dd)) * no optional chaining in v13 ([d08627b](d08627b)) * **pretty-date:** plural form when the value is 1 ([#20619](#20619)) ([#20641](#20641)) ([4d6b776](4d6b776)) * validate if doctype exists before syncing customisations ([#20598](#20598)) ([#20644](#20644)) ([32ba65f](32ba65f)) ### Features * add context to confirm dailog ([0e21299](0e21299)) * add context to prompt dialog ([1bbf9c9](1bbf9c9)) * make report name translatable (backport [#20608](#20608)) ([#20617](#20617)) ([a92e69e](a92e69e)) * **minor:** log datetime in worker log (backport [#20414](#20414)) ([#20569](#20569)) ([dccb6af](dccb6af))
|
🎉 This PR is included in version 13.53.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is an automatic backport of pull request #20506 done by Mergify.
Cherry-pick of 06580bd has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com