diff options
author | Amine El Mouafik <412895+kytwb@users.noreply.github.com> | 2021-02-08 10:34:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-08 10:34:45 +0100 |
commit | 035002ceedf78d5ec73eabc0df7f06139939b967 (patch) | |
tree | 1c0d1e9531bae05fb65d70b9ea25baf404b74fe1 /src/containers/layout | |
parent | docs: add k0staa as a contributor (#1193) (diff) | |
download | ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.gz ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.zst ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.zip |
Synchronize with Franz 5.6.0 (#1033)
Co-authored-by: FranzBot <i18n@meetfranz.com>
Co-authored-by: vantezzen <hello@vantezzen.io>
Co-authored-by: Makazzz <makazzzpro@live.ca>
Co-authored-by: Stefan Malzner <stefan@adlk.io>
Co-authored-by: Amine Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/containers/layout')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index a4312d9de..d7e413bb9 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -116,6 +116,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
116 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} | 116 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} |
117 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} | 117 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} |
118 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 118 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
119 | isTodosServiceActive={services.isTodosServiceActive || false} | ||
119 | /> | 120 | /> |
120 | ); | 121 | ); |
121 | 122 | ||
@@ -131,6 +132,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
131 | update={updateService} | 132 | update={updateService} |
132 | userHasCompletedSignup={user.hasCompletedSignup} | 133 | userHasCompletedSignup={user.hasCompletedSignup} |
133 | hasActivatedTrial={user.hasActivatedTrial} | 134 | hasActivatedTrial={user.hasActivatedTrial} |
135 | isSpellcheckerEnabled={settings.app.enableSpellchecking} | ||
134 | /> | 136 | /> |
135 | ); | 137 | ); |
136 | 138 | ||