tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option to disable two factor auth in admin accounts panel. (#2584)

Browse Source 
* Add option to disable two factor auth in admin accounts panel.
Closes #2578

* Add @mjankowski's suggestions.
* Moves destroy actions behind User#disable_two_factor!
* Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!
This commit is contained in:
Kaylee
2017-05-02 20:07:12 +01:00
committed by Eugen Rochko
parent b5eec34230
commit 7880671f35
7 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/en.yml
View File

@ -84,6 +84,7 @@ en:
public: Public
push_subscription_expires: PuSH subscription expires
reset_password: Reset password
disable_two_factor_authentication: Disable 2FA
salmon_url: Salmon URL
show:
created_reports: Reports created by this account