aboutsummaryrefslogtreecommitdiff
path: root/src/modules/config.js
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2019-03-25 19:54:15 +0200
committerHenry Jameson <me@hjkos.com>2019-03-25 19:54:15 +0200
commit3b5fc889890f5dacfd4086ff358c868ef3029d23 (patch)
treee9f2bfc9cd986341eda0ff7da7410066f1ede857 /src/modules/config.js
parente617ed285e8ecb13829558197bdf04ffb9583ea9 (diff)
parentb02085f2ef2842f06fe9d29eb6bf8e71809aed64 (diff)
Merge remote-tracking branch 'upstream/develop' into mastoapi/convos
* upstream/develop: (34 commits) Update attachment normalizer Add fallback for attachments uploaded via the other platforms Get correct mimetype through entity_normalizer Set default parameter Switch to mastoapi for posting status and uploading media Revert changes prevent text pasting if image is pasted remove border radius of suggested emojis #450 - dispatch login after saved state is loaded #448 - fix timeline fetch error when status text is null #451 - add class to username span No need to fetch mutes on load anymore 🙌 switch to mastoapi switch to mastoapi masto api sends muted property now No need to fetch user data using old api anymore 🎉 Switch to mastoapi Add comment Reset statusnet_blocking of all fetched users first while refreshing block list Add hideMutedPosts setting and wire up to post-returning endpoints ...
Diffstat (limited to 'src/modules/config.js')
-rw-r--r--src/modules/config.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/config.js b/src/modules/config.js
index 1c30c203..c5491c01 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -5,6 +5,7 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0]
const defaultState = {
colors: {},
+ hideMutedPosts: undefined, // instance default
collapseMessageWithSubject: undefined, // instance default
hideAttachments: false,
hideAttachmentsInConv: false,