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:38:30 +02:00
commit b0654ebc32
2 changed files with 2 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('minimalScopesOptions') copyInstanceOption('minimalScopesMode')
copyInstanceOption('formattingOptionsEnabled') copyInstanceOption('formattingOptionsEnabled')
copyInstanceOption('collapseMessageWithSubject') copyInstanceOption('collapseMessageWithSubject')
copyInstanceOption('loginMethod') copyInstanceOption('loginMethod')

View file

@ -23,5 +23,5 @@
"noAttachmentLinks": false, "noAttachmentLinks": false,
"nsfwCensorImage": "", "nsfwCensorImage": "",
"showFeaturesPanel": true, "showFeaturesPanel": true,
"minimalScopesOptions": true "minimalScopesMode": true
} }