From 70c05a0c085adb95ef9946ac58a461f56252c2c2 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 8 Feb 2019 12:17:14 -0800 Subject: Fix showFeaturesPanel option as instance --- src/modules/config.js | 3 +-- src/modules/instance.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules') diff --git a/src/modules/config.js b/src/modules/config.js index 526a7021..c9528f6f 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -30,8 +30,7 @@ const defaultState = { interfaceLanguage: browserLocale, scopeCopy: undefined, // instance default subjectLineBehavior: undefined, // instance default - alwaysShowSubjectInput: undefined, // instance default - showFeaturesPanel: true + alwaysShowSubjectInput: undefined // instance default } const config = { diff --git a/src/modules/instance.js b/src/modules/instance.js index 4ad41873..1bb5eb1b 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -28,6 +28,7 @@ const defaultState = { nsfwCensorImage: undefined, vapidPublicKey: undefined, noAttachmentLinks: false, + showFeaturesPanel: false, // Nasty stuff pleromaBackend: true, -- cgit v1.2.3-70-g09d2 From ced29a64827ee4f34c71776cb217188093e7ee58 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 8 Feb 2019 13:18:50 -0800 Subject: fixing conflicts --- src/modules/config.js | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/modules') diff --git a/src/modules/config.js b/src/modules/config.js index eb2df541..71f71376 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -30,13 +30,8 @@ const defaultState = { interfaceLanguage: browserLocale, scopeCopy: undefined, // instance default subjectLineBehavior: undefined, // instance default -<<<<<<< HEAD - alwaysShowSubjectInput: undefined // instance default -======= alwaysShowSubjectInput: undefined, // instance default - showFeaturesPanel: true, postContentType: undefined // instance default ->>>>>>> da0a5535eb09f6637df921a8a5f951c295bedeac } const config = { -- cgit v1.2.3-70-g09d2 From 5b52e020e32def19622e3d1df82f93bc716946e2 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 8 Feb 2019 13:20:47 -0800 Subject: fixing conflicts --- src/modules/instance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/instance.js b/src/modules/instance.js index 46ca04d8..b4ec8253 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -29,7 +29,7 @@ const defaultState = { nsfwCensorImage: undefined, vapidPublicKey: undefined, noAttachmentLinks: false, - showFeaturesPanel: false, + showFeaturesPanel: true, // Nasty stuff pleromaBackend: true, -- cgit v1.2.3-70-g09d2