Merge branch 'greentext-strikes-back' into 'develop'

⑨ Added greentext support ⑨ Closes #9 See merge request pleroma/pleroma-fe!994
2019-11-19 14:22:17 +00:00 · 2019-11-19 14:22:17 +00:00 · 0eda60eeb4
commit 0eda60eeb4
parent aa1b812484 28efd7d862
10 changed files with 256 additions and 13 deletions
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -45,6 +45,7 @@ export const defaultState = {
  playVideosInModal: false,
  useOneClickNsfw: false,
  useContainFit: false,
+  greentext: undefined, // instance default
  hidePostStats: undefined, // instance default
  hideUserStats: undefined // instance default
 }
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@ -32,6 +32,7 @@ const defaultState = {
  noAttachmentLinks: false,
  showFeaturesPanel: true,
  minimalScopesMode: false,
+  greentext: false,

  // Nasty stuff
  pleromaBackend: true,