aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar vantezzen <properly@protonmail.com>2019-09-07 15:57:53 +0200
committerLibravatar vantezzen <properly@protonmail.com>2019-09-07 15:57:53 +0200
commitce40491ca54a66aab7dd70ab3dfb44ab22d7fdad (patch)
treeb977d83bb4d86283eef22fd3b1f1202e3c5a75e0
parentEnable todos for all users (diff)
downloadferdium-app-ce40491ca54a66aab7dd70ab3dfb44ab22d7fdad.tar.gz
ferdium-app-ce40491ca54a66aab7dd70ab3dfb44ab22d7fdad.tar.zst
ferdium-app-ce40491ca54a66aab7dd70ab3dfb44ab22d7fdad.zip
Bump version number
-rw-r--r--CHANGELOG.md17
-rw-r--r--package.json2
-rw-r--r--src/features/todos/containers/TodosScreen.js2
3 files changed, 19 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72794b646..a407cb0d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
1## [5.3.2](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.2) (2019-09-07)
2Merge Franz v5.3.0 into Ferdi.
3
4- Enable todos for all users
5
6### Bug Fixes
7
8* **Windows:** Fix app size in fullscreen ([e210701](https://github.com/kytwb/ferdi/commit/e210701))
9* **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/kytwb/ferdi/commit/42f97b4))
10
11
12### Features
13
14* **Todos:** Add option to disable todos ([5d03b91](https://github.com/kytwb/ferdi/commit/5d03b91))
15
16
17
1## [5.3.1](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.1) (2019-09-06) 18## [5.3.1](https://github.com/kytwb/ferdi/compare/v5.3.0...v5.3.1) (2019-09-06)
2- Fix WhatsApp recipe not working (#19 and #21) 19- Fix WhatsApp recipe not working (#19 and #21)
3 20
diff --git a/package.json b/package.json
index 36580a0f7..e8d904a64 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
2 "name": "ferdi", 2 "name": "ferdi",
3 "productName": "Ferdi", 3 "productName": "Ferdi",
4 "appId": "com.kytwb.ferdi", 4 "appId": "com.kytwb.ferdi",
5 "version": "5.3.1", 5 "version": "5.3.2",
6 "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", 6 "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
7 "copyright": "kytwb", 7 "copyright": "kytwb",
8 "main": "index.js", 8 "main": "index.js",
diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js
index 0bd591c59..bc05a587d 100644
--- a/src/features/todos/containers/TodosScreen.js
+++ b/src/features/todos/containers/TodosScreen.js
@@ -25,7 +25,7 @@ class TodosScreen extends Component {
25 width={todosStore.width} 25 width={todosStore.width}
26 minWidth={TODOS_MIN_WIDTH} 26 minWidth={TODOS_MIN_WIDTH}
27 resize={width => todoActions.resize({ width })} 27 resize={width => todoActions.resize({ width })}
28 isTodosIncludedInCurrentPlan={true} 28 isTodosIncludedInCurrentPlan
29 /> 29 />
30 </ErrorBoundary> 30 </ErrorBoundary>
31 ); 31 );