Merge branch 'develop' into 'fix/use-semantically-correct-buttons'
# Conflicts: # CHANGELOG.md
This commit is contained in:
commit
655d985a82
16 changed files with 5794 additions and 1081 deletions
|
@ -68,8 +68,7 @@ const ProfileTab = {
|
|||
...this.$store.state.instance.emoji,
|
||||
...this.$store.state.instance.customEmoji
|
||||
],
|
||||
users: this.$store.state.users.users,
|
||||
updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
|
||||
store: this.$store
|
||||
})
|
||||
},
|
||||
emojiSuggestor () {
|
||||
|
@ -79,10 +78,7 @@ const ProfileTab = {
|
|||
] })
|
||||
},
|
||||
userSuggestor () {
|
||||
return suggestor({
|
||||
users: this.$store.state.users.users,
|
||||
updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
|
||||
})
|
||||
return suggestor({ store: this.$store })
|
||||
},
|
||||
fieldsLimits () {
|
||||
return this.$store.state.instance.fieldsLimits
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue