diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-11-08 02:21:19 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-11-08 02:21:19 +0000 |
| commit | e0a1b14eaba7699f47b4f76fc6482a28b3b63d7d (patch) | |
| tree | 64c6fcd0b29f494f17fff314ea2b771f6868eb10 /src/components/user_settings/user_settings.vue | |
| parent | 326b2416a0779957e2336a117d26aee9bde89bc4 (diff) | |
| parent | e3381cdef1b410aafce15f2d2f1caeccbfae7c87 (diff) | |
Merge branch 'feature/change-email' into 'develop'
Add ability to change user's email
Closes pleroma#1297
See merge request pleroma/pleroma-fe!983
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index adf11907..8c18cf49 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -85,7 +85,7 @@ <Checkbox v-model="hideFollowsCount" :disabled="!hideFollows" - > + > {{ $t('settings.hide_follows_count_description') }} </Checkbox> </p> @@ -234,6 +234,39 @@ <div :label="$t('settings.security_tab')"> <div class="setting-item"> + <h2>{{ $t('settings.change_email') }}</h2> + <div> + <p>{{ $t('settings.new_email') }}</p> + <input + v-model="newEmail" + type="email" + autocomplete="email" + > + </div> + <div> + <p>{{ $t('settings.current_password') }}</p> + <input + v-model="changeEmailPassword" + type="password" + autocomplete="current-password" + > + </div> + <button + class="btn btn-default" + @click="changeEmail" + > + {{ $t('general.submit') }} + </button> + <p v-if="changedEmail"> + {{ $t('settings.changed_email') }} + </p> + <template v-if="changeEmailError !== false"> + <p>{{ $t('settings.change_email_error') }}</p> + <p>{{ changeEmailError }}</p> + </template> + </div> + + <div class="setting-item"> <h2>{{ $t('settings.change_password') }}</h2> <div> <p>{{ $t('settings.current_password') }}</p> |