aboutsummaryrefslogtreecommitdiff
path: root/src/modules/config.js
diff options
context:
space:
mode:
authorHenry <spam@hjkos.com>2018-11-26 01:50:54 +0000
committerHenry <spam@hjkos.com>2018-11-26 01:50:54 +0000
commit91272dc5558e1326dac872f927dc8da7f9109cd0 (patch)
tree42b479fa25d0fe4c39401f9759e2f35323f86b61 /src/modules/config.js
parentf1a23f2b6edb0858890c82cf42c8b6d835102d56 (diff)
parentb948234aec2ec1d140a46303c09d24424262bd66 (diff)
Merge branch 'feature/scope_preferences' into 'develop'
Make visibility copying and subject copying configurable Closes #135 See merge request pleroma/pleroma-fe!353
Diffstat (limited to 'src/modules/config.js')
-rw-r--r--src/modules/config.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/config.js b/src/modules/config.js
index 522940f6..0d36e9bf 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -5,7 +5,7 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0]
const defaultState = {
colors: {},
- collapseMessageWithSubject: undefined,
+ collapseMessageWithSubject: undefined, // instance default
hideAttachments: false,
hideAttachmentsInConv: false,
hideNsfw: true,
@@ -25,7 +25,9 @@ const defaultState = {
},
muteWords: [],
highlight: {},
- interfaceLanguage: browserLocale
+ interfaceLanguage: browserLocale,
+ scopeCopy: undefined, // instance default
+ subjectLineBehavior: undefined // instance default
}
const config = {