Merge branch 'minimal-scopes-mode' into shigusegubu

* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
This commit is contained in:
Henry Jameson 2019-03-03 15:32:36 +02:00
commit 5727873ebb
2 changed files with 3 additions and 2 deletions

View file

@ -78,7 +78,7 @@ const afterStoreSetup = ({ store, i18n }) => {
copyInstanceOption('redirectRootNoLogin') copyInstanceOption('redirectRootNoLogin')
copyInstanceOption('redirectRootLogin') copyInstanceOption('redirectRootLogin')
copyInstanceOption('showInstanceSpecificPanel') copyInstanceOption('showInstanceSpecificPanel')
copyInstanceOption('minimalScopeOptions') copyInstanceOption('minimalScopesOptions')
copyInstanceOption('formattingOptionsEnabled') copyInstanceOption('formattingOptionsEnabled')
copyInstanceOption('collapseMessageWithSubject') copyInstanceOption('collapseMessageWithSubject')
copyInstanceOption('loginMethod') copyInstanceOption('loginMethod')

View file

@ -22,5 +22,6 @@
"webPushNotifications": false, "webPushNotifications": false,
"noAttachmentLinks": false, "noAttachmentLinks": false,
"nsfwCensorImage": "", "nsfwCensorImage": "",
"showFeaturesPanel": true "showFeaturesPanel": true,
"minimalScopesOptions": false
} }