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

Merge branch 'develop' into 'feat/relationship-refactor'

Browse source 
# Conflicts:
#   src/components/notification/notification.js
This commit is contained in:
Shpuld Shpludson 2020-05-08 08:35:30 +00:00
commit 1186205583
26 changed files with 1071 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/boot/after_store.js
View file

@ -241,6 +241,9 @@ const getNodeInfo = async ({ store }) => {
: federation.enabled
})
const accountActivationRequired = metadata.accountActivationRequired
store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: accountActivationRequired })
const accounts = metadata.staffAccounts
resolveStaffAccounts({ store, accounts })
} else {