aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_settings/user_settings.vue
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-02-10 14:51:35 +0000
committerShpuld Shpludson <shp@cock.li>2020-02-10 14:51:35 +0000
commit17b6d8ddb8a9a1637fd88e017170b973b97381da (patch)
tree195d8c95342696e753f0c11bec73f049fbbcdf9b /src/components/user_settings/user_settings.vue
parent6be6241767f13d5a46f2c5455281a03ae2a5e844 (diff)
parentce68ef0138f43fed6617f197d46cc09ac68f9e31 (diff)
Merge branch 'move-type-notification' into 'develop'
Add setting for allow following move Closes #732 See merge request pleroma/pleroma-fe!1054
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
-rw-r--r--src/components/user_settings/user_settings.vue9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 2222c293..8b2336b4 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -90,9 +90,7 @@
</Checkbox>
</p>
<p>
- <Checkbox
- v-model="hideFollowers"
- >
+ <Checkbox v-model="hideFollowers">
{{ $t('settings.hide_followers_description') }}
</Checkbox>
</p>
@@ -104,6 +102,11 @@
{{ $t('settings.hide_followers_count_description') }}
</Checkbox>
</p>
+ <p>
+ <Checkbox v-model="allowFollowingMove">
+ {{ $t('settings.allow_following_move') }}
+ </Checkbox>
+ </p>
<p v-if="role === 'admin' || role === 'moderator'">
<Checkbox v-model="showRole">
<template v-if="role === 'admin'">