]> cat aescling's git repositories - mastodon.git/commit
Add password challenge to 2FA settings, e-mail notifications (#11878)
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 18 Sep 2019 14:37:27 +0000 (16:37 +0200)
committerGitHub <noreply@github.com>
Wed, 18 Sep 2019 14:37:27 +0000 (16:37 +0200)
commite1066cd4319a220d5be16e51ffaf5236a2f6e866
tree3cac387721ffb3cefa66d96d1867ae88c9e249ce
parentd0c2c5278391b82ba7fa2f230bf237805ff61a0c
Add password challenge to 2FA settings, e-mail notifications (#11878)

Fix #3961
32 files changed:
app/controllers/admin/two_factor_authentications_controller.rb
app/controllers/auth/challenges_controller.rb [new file with mode: 0644]
app/controllers/auth/sessions_controller.rb
app/controllers/concerns/challengable_concern.rb [new file with mode: 0644]
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
app/controllers/settings/two_factor_authentications_controller.rb
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/forms.scss
app/mailers/user_mailer.rb
app/models/form/challenge.rb [new file with mode: 0644]
app/models/user.rb
app/views/auth/challenges/new.html.haml [new file with mode: 0644]
app/views/auth/shared/_links.html.haml
app/views/settings/two_factor_authentications/show.html.haml
app/views/user_mailer/two_factor_disabled.html.haml [new file with mode: 0644]
app/views/user_mailer/two_factor_disabled.text.erb [new file with mode: 0644]
app/views/user_mailer/two_factor_enabled.html.haml [new file with mode: 0644]
app/views/user_mailer/two_factor_enabled.text.erb [new file with mode: 0644]
app/views/user_mailer/two_factor_recovery_codes_changed.html.haml [new file with mode: 0644]
app/views/user_mailer/two_factor_recovery_codes_changed.text.erb [new file with mode: 0644]
config/locales/devise.en.yml
config/locales/en.yml
config/locales/simple_form.en.yml
config/routes.rb
spec/controllers/auth/challenges_controller_spec.rb [new file with mode: 0644]
spec/controllers/auth/sessions_controller_spec.rb
spec/controllers/concerns/challengable_concern_spec.rb [new file with mode: 0644]
spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb
spec/controllers/settings/two_factor_authentications_controller_spec.rb
spec/mailers/previews/user_mailer_preview.rb