diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-02-10 14:51:35 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-02-10 14:51:35 +0000 |
| commit | 17b6d8ddb8a9a1637fd88e017170b973b97381da (patch) | |
| tree | 195d8c95342696e753f0c11bec73f049fbbcdf9b /src/components/interactions | |
| parent | 6be6241767f13d5a46f2c5455281a03ae2a5e844 (diff) | |
| parent | ce68ef0138f43fed6617f197d46cc09ac68f9e31 (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/interactions')
| -rw-r--r-- | src/components/interactions/interactions.js | 1 | ||||
| -rw-r--r-- | src/components/interactions/interactions.vue | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/components/interactions/interactions.js b/src/components/interactions/interactions.js index cc31ff20..7fe5e76d 100644 --- a/src/components/interactions/interactions.js +++ b/src/components/interactions/interactions.js @@ -10,6 +10,7 @@ const tabModeDict = { const Interactions = { data () { return { + allowFollowingMove: this.$store.state.users.currentUser.allow_following_move, filterMode: tabModeDict['mentions'] } }, diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue index a2e252ab..57d5d87c 100644 --- a/src/components/interactions/interactions.vue +++ b/src/components/interactions/interactions.vue @@ -22,6 +22,7 @@ :label="$t('interactions.follows')" /> <span + v-if="!allowFollowingMove" key="moves" :label="$t('interactions.moves')" /> |