therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'iss-149/profile-fields-setting'

Browse source 
# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue
This commit is contained in:
Shpuld Shpludson 2020-06-27 07:19:49 +00:00
commit ea0a12f604
50 changed files with 570 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/settings_modal/tabs/profile_tab.js
View file

@ -25,6 +25,7 @@ const ProfileTab = {
showRole: this.$store.state.users.currentUser.show_role,
role: this.$store.state.users.currentUser.role,
discoverable: this.$store.state.users.currentUser.discoverable,
bot: this.$store.state.users.currentUser.bot,
allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
pickAvatarBtnVisible: true,
bannerUploading: false,
@ -94,6 +95,7 @@ const ProfileTab = {
hide_follows: this.hideFollows,
hide_followers: this.hideFollowers,
discoverable: this.discoverable,
bot: this.bot,
allow_following_move: this.allowFollowingMove,
hide_follows_count: this.hideFollowsCount,
hide_followers_count: this.hideFollowersCount,