diff options
| author | Henry Jameson <me@hjkos.com> | 2021-03-08 22:01:28 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2021-03-08 22:01:28 +0200 |
| commit | 2e7bd99444546b3a71e1ff0753e12e6706c8228e (patch) | |
| tree | b01067c88bc969041d23392e7e34c976fae7b801 /src/components/mfa_form/recovery_form.vue | |
| parent | 9a8bc245a6f76f1a41da9d05408dadc36625ffe9 (diff) | |
| parent | 6281241b92bc17a9535b15a52e656b9f218e3322 (diff) | |
Merge remote-tracking branch 'origin/develop' into websocket-fixes
* origin/develop: (119 commits)
Apply 1 suggestion(s) to 1 file(s)
Make it possible to localize user highlight options
remove shoutbox test hacks
fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack
update changelog with 2.3.0
change icons around
Translated using Weblate (Japanese)
Update timeline_quick_settings.js
add screen_name_ui to tests
separate screen_name and screen_name_ui with decoded punycode
Update CHANGELOG.md
add basic validation for statusless status notifications
changelog mention
fix chat unread badge
update shelljs to get rid of warnings on build
save a few characters
focus input in emoji picker and react picker
fix vue warnings
add only to wording
basic loggedin check for reply filtering
...
Diffstat (limited to 'src/components/mfa_form/recovery_form.vue')
| -rw-r--r-- | src/components/mfa_form/recovery_form.vue | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue index 0bf68e27..7c594228 100644 --- a/src/components/mfa_form/recovery_form.vue +++ b/src/components/mfa_form/recovery_form.vue @@ -25,6 +25,7 @@ <div> <button class="button-unstyled -link" + type="button" @click.prevent="requireTOTP" > {{ $t('login.enter_two_factor_code') }} @@ -32,6 +33,7 @@ <br> <button class="button-unstyled -link" + type="button" @click.prevent="abortMFA" > {{ $t('general.cancel') }} |