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

Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret

Browse source 
* upstream/develop:
  Revert "add TOTP/Recovery Form for mobile version"
This commit is contained in:
Henry Jameson 2019-06-13 00:51:14 +03:00
commit c8a57ad32e
32 changed files with 1658 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/boot/after_store.js
View file

@ -94,6 +94,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
? 0
: config.logoMargin
})
store.commit('authFlow/setInitialStrategy', config.loginMethod)
copyInstanceOption('redirectRootNoLogin')
copyInstanceOption('redirectRootLogin')
@ -102,7 +103,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
copyInstanceOption('formattingOptionsEnabled')
copyInstanceOption('hideMutedPosts')
copyInstanceOption('collapseMessageWithSubject')
copyInstanceOption('loginMethod')
copyInstanceOption('scopeCopy')
copyInstanceOption('subjectLineBehavior')
copyInstanceOption('postContentType')