diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-02-27 18:31:13 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-02-27 18:31:13 +0000 |
| commit | b4782ad159026e3fb50c476e5cf9d89176e441f4 (patch) | |
| tree | dfa491edeb8e5817699498289f81ce900fbd947f /src/modules | |
| parent | aa5cb3d1d2421eaf5cc9e08264f7924a627319a3 (diff) | |
| parent | ecb211606cddeeec809c8a6bc39f9c96a0af95f5 (diff) | |
Merge branch 'feat/sensitive-by-default' into 'develop'
close #1054 add sensitive by default option
Closes #1054
See merge request pleroma/pleroma-fe!1354
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/config.js | 3 | ||||
| -rw-r--r-- | src/modules/instance.js | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index f992519e..eca58c12 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -67,7 +67,8 @@ export const defaultState = { greentext: undefined, // instance default hidePostStats: undefined, // instance default hideUserStats: undefined, // instance default - virtualScrolling: undefined // instance default + virtualScrolling: undefined, // instance default + sensitiveByDefault: undefined // instance default } // caching the instance default properties diff --git a/src/modules/instance.js b/src/modules/instance.js index 411b1caa..96de73ca 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -43,6 +43,7 @@ const defaultState = { subjectLineBehavior: 'email', theme: 'pleroma-dark', virtualScrolling: true, + sensitiveByDefault: false, // Nasty stuff customEmoji: [], |