logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 3fa9b39150c318972511882239304bc08f6f57ad
parent: 914386270796fa2ec460b828710ee31ef870ea69
Author: HJ <spam@hjkos.com>
Date:   Wed,  5 Dec 2018 07:56:00 +0000

Merge branch 'fix_alwaysSubject' into 'develop'

Hotfix for !388

See merge request pleroma/pleroma-fe!401

Diffstat:

Msrc/boot/after_store.js2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js @@ -58,6 +58,7 @@ const afterStoreSetup = ({store, i18n}) => { var loginMethod = (config.loginMethod) var scopeCopy = (config.scopeCopy) var subjectLineBehavior = (config.subjectLineBehavior) + var alwaysShowSubjectInput = (config.alwaysShowSubjectInput) store.dispatch('setInstanceOption', { name: 'theme', value: theme }) store.dispatch('setInstanceOption', { name: 'background', value: background }) @@ -75,6 +76,7 @@ const afterStoreSetup = ({store, i18n}) => { store.dispatch('setInstanceOption', { name: 'loginMethod', value: loginMethod }) store.dispatch('setInstanceOption', { name: 'scopeCopy', value: scopeCopy }) store.dispatch('setInstanceOption', { name: 'subjectLineBehavior', value: subjectLineBehavior }) + store.dispatch('setInstanceOption', { name: 'alwaysShowSubjectInput', value: alwaysShowSubjectInput }) if (chatDisabled) { store.dispatch('disableChat') }