hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge develop

Browse source
This commit is contained in:
jared 2019-04-02 10:53:33 -04:00
commit 79efe0646c
51 changed files with 835 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/user_settings/user_settings.js
View file

@ -4,6 +4,7 @@ import get from 'lodash/get'
import TabSwitcher from '../tab_switcher/tab_switcher.js'
import ImageCropper from '../image_cropper/image_cropper.vue'
import StyleSwitcher from '../style_switcher/style_switcher.vue'
import ScopeSelector from '../scope_selector/scope_selector.vue'
import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
import BlockCard from '../block_card/block_card.vue'
import MuteCard from '../mute_card/mute_card.vue'
@ -67,6 +68,7 @@ const UserSettings = {
},
components: {
StyleSwitcher,
ScopeSelector,
TabSwitcher,
ImageCropper,
BlockList,
@ -80,8 +82,8 @@ const UserSettings = {
pleromaBackend () {
return this.$store.state.instance.pleromaBackend
},
scopeOptionsEnabled () {
return this.$store.state.instance.scopeOptionsEnabled
minimalScopesMode () {
return this.$store.state.instance.minimalScopesMode
},
vis () {
return {