diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-06-15 21:32:20 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-06-15 21:32:20 +0000 |
| commit | 338134acfb5dc70210b55e5e1736b6f90f9d250c (patch) | |
| tree | 58740d894b77b9341f9da96c50dd38f9711be28d /src/components | |
| parent | 2725a0c6398a876590b458ff1a8d6c2cc9af1d11 (diff) | |
| parent | d7a53aec613c6da7f67906b16f052ec4e7441960 (diff) | |
Merge branch 'hideShoutbox' into 'develop'
New user option: Hide floating shoutbox
See merge request pleroma/pleroma-fe!1396
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.js | 1 | ||||
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js index 07fccf57..eeda61bf 100644 --- a/src/components/settings_modal/tabs/general_tab.js +++ b/src/components/settings_modal/tabs/general_tab.js @@ -50,6 +50,7 @@ const GeneralTab = { return this.$store.state.instance.background && !this.$store.state.users.currentUser.background_image }, + instanceShoutboxPresent () { return this.$store.state.instance.shoutAvailable }, ...SharedComputedObject() } } diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index bdb29edf..d3e71b31 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -21,6 +21,11 @@ {{ $t('settings.hide_wallpaper') }} </BooleanSetting> </li> + <li v-if="instanceShoutboxPresent"> + <BooleanSetting path="hideShoutbox"> + {{ $t('settings.hide_shoutbox') }} + </BooleanSetting> + </li> </ul> </div> <div class="setting-item"> |