aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-12-03 11:23:38 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2018-12-03 11:23:38 +0100
commitedbceda6a939d469a5d371784a7e584a4aade000 (patch)
tree75d338d7039271cd58a50aa386935ddef1b13250
parentOpen dev tools with --devtools cmd line flag (diff)
parentMerge branch 'develop' (diff)
downloadferdium-app-edbceda6a939d469a5d371784a7e584a4aade000.tar.gz
ferdium-app-edbceda6a939d469a5d371784a7e584a4aade000.tar.zst
ferdium-app-edbceda6a939d469a5d371784a7e584a4aade000.zip
Merge branch 'master' into develop
-rw-r--r--CHANGELOG.md59
-rw-r--r--README.md5
-rw-r--r--docs/linux.md2
-rw-r--r--package.json2
-rw-r--r--src/containers/layout/AppLayoutContainer.js3
-rw-r--r--src/stores/AppStore.js25
-rw-r--r--src/stores/FeaturesStore.js6
-rw-r--r--src/stores/SettingsStore.js4
8 files changed, 55 insertions, 51 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38cba0829..c03d1a8ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
1<a name="5.0.0-beta.19"></a>
2# [5.0.0-beta.19](https://github.com/meetfranz/franz/compare/v5.0.0-beta.18...v5.0.0-beta.19) (2018-12-02)
3
4### General
5
6* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
7
8### Features
9
10* **App:** 👉 Dark Mode 👈 ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f)) 🙌 [@guillecura](https://github.com/guillecura)
11* **App:** Add proxy support for services ([6297274](https://github.com/meetfranz/franz/commit/6297274))
12* **App:** New spell checker ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e))
13* **App:** New context menu ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e))
14* **App:** Lay groundwork for general themeing support ([4ea044a](https://github.com/meetfranz/franz/commit/4ea044a))
15* **App:** Add option to enable dark mode for supported services ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f))
16
17### Bug Fixes
18
19* **App:** App menu was not initialized on app launch. Resolving copy & paste issues for login. ([72d4164](https://github.com/meetfranz/franz/commit/72d4164))
20* **General:** Convert many links from http to https ([#967](https://github.com/meetfranz/franz/issues/967)) 🙌 [@Stanzilla](https://github.com/Stanzilla) ([04a23b7](https://github.com/meetfranz/franz/commit/04a23b7))
21* **Menu:** Fix File -> Quit menu entry ([#888](https://github.com/meetfranz/franz/issues/888)) 🙌 [@dabalroman](https://github.com/dabalroman) ([4115b27](https://github.com/meetfranz/franz/commit/4115b27))
22* **Windows:** Fix impossible Ctrl+10 Shortcut ([0db7c12](https://github.com/meetfranz/franz/commit/0db7c12))
23* **Windows:** Remove minimize setting check on close event ([#1038](https://github.com/meetfranz/franz/issues/1038)) 🙌 [@imaginarny](https://github.com/imaginarny) ([af9d356](https://github.com/meetfranz/franz/commit/af9d356))
24
25
1<a name="5.0.0-beta.18"></a> 26<a name="5.0.0-beta.18"></a>
2# [5.0.0-beta.18](https://github.com/meetfranz/franz/compare/v5.0.0-beta.16...v5.0.0-beta.18) (2018-04-03) 27# [5.0.0-beta.18](https://github.com/meetfranz/franz/compare/v5.0.0-beta.16...v5.0.0-beta.18) (2018-04-03)
3 28
@@ -95,11 +120,11 @@ fix(App): Bugfix Fix memory leak in recipe polling loop
95* **Notification:** Remove notification sound when app is muted ([53fde0c](https://github.com/meetfranz/franz/commit/53fde0c)) 120* **Notification:** Remove notification sound when app is muted ([53fde0c](https://github.com/meetfranz/franz/commit/53fde0c))
96* **Recipes:** Enable `urlInputPrefix` for team and customURL ([873957d](https://github.com/meetfranz/franz/commit/873957d)) 121* **Recipes:** Enable `urlInputPrefix` for team and customURL ([873957d](https://github.com/meetfranz/franz/commit/873957d))
97* **Services:** Ctrl/Cmd+R now navigates back to the service root ([7293492](https://github.com/meetfranz/franz/commit/7293492)) 122* **Services:** Ctrl/Cmd+R now navigates back to the service root ([7293492](https://github.com/meetfranz/franz/commit/7293492))
98* **Services:** Fix transparent service background ([ed0098f](https://github.com/meetfranz/franz/commit/ed0098f)), closes [#361](https://github.com/meetfranz/franz/issues/361) 123* **Services:** Fix transparent service background ([ed0098f](https://github.com/meetfranz/franz/commit/ed0098f))
99* **Shortcuts:** Fixed settings shortcut inconsistency ([ca74846](https://github.com/meetfranz/franz/commit/ca74846)) 124* **Shortcuts:** Fixed settings shortcut inconsistency ([ca74846](https://github.com/meetfranz/franz/commit/ca74846))
100* **Spell checker:** Fixed issues with spell checker ([965fdf2](https://github.com/meetfranz/franz/commit/965fdf2)) 125* **Spell checker:** Fixed issues with spell checker ([965fdf2](https://github.com/meetfranz/franz/commit/965fdf2))
101* **Translations:** Re-add Spanish to available languages. ([ad936f2](https://github.com/meetfranz/franz/commit/ad936f2)) 126* **Translations:** Re-add Spanish to available languages. ([ad936f2](https://github.com/meetfranz/franz/commit/ad936f2))
102* **Windows:** Open window when clicking on toast notification ([b82bbc8](https://github.com/meetfranz/franz/commit/b82bbc8)), closes [#370](https://github.com/meetfranz/franz/issues/370) 127* **Windows:** Open window when clicking on toast notification ([b82bbc8](https://github.com/meetfranz/franz/commit/b82bbc8))
103 128
104 129
105<a name="5.0.0-beta.14"></a> 130<a name="5.0.0-beta.14"></a>
@@ -110,9 +135,9 @@ fix(App): Bugfix Fix memory leak in recipe polling loop
110 135
111* **App:** Add link to changelog in app update notification ([2cbd938](https://github.com/meetfranz/franz/commit/2cbd938)) 136* **App:** Add link to changelog in app update notification ([2cbd938](https://github.com/meetfranz/franz/commit/2cbd938))
112* **App:** Add option to enable/disable spell checker ([dcab45a](https://github.com/meetfranz/franz/commit/dcab45a)) 137* **App:** Add option to enable/disable spell checker ([dcab45a](https://github.com/meetfranz/franz/commit/dcab45a))
113* **App:** Add option to mute all services in sidebar ([f5a9aa2](https://github.com/meetfranz/franz/commit/f5a9aa2)), closes [#8](https://github.com/meetfranz/franz/issues/8) [#162](https://github.com/meetfranz/franz/issues/162) 138* **App:** Add option to mute all services in sidebar ([f5a9aa2](https://github.com/meetfranz/franz/commit/f5a9aa2))
114* **App:** Decrease minimum window size to 600px width ([2521621](https://github.com/meetfranz/franz/commit/2521621)), closes [#239](https://github.com/meetfranz/franz/issues/239) 139* **App:** Decrease minimum window size to 600px width ([2521621](https://github.com/meetfranz/franz/commit/2521621))
115* **App:** Respect System DoNotDisturb mode for service audio ([7d41227](https://github.com/meetfranz/franz/commit/7d41227)), closes [#162](https://github.com/meetfranz/franz/issues/162) 140* **App:** Respect System DoNotDisturb mode for service audio ([7d41227](https://github.com/meetfranz/franz/commit/7d41227))
116* **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff)) 141* **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff))
117* **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1)) 142* **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1))
118* **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu)) 143* **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu))
@@ -121,11 +146,11 @@ fix(App): Bugfix Fix memory leak in recipe polling loop
121 146
122### Bug Fixes 147### Bug Fixes
123 148
124* **Windows:** Fix notifications on Windows 10 (Fall Creators Update) ([eea4801](https://github.com/meetfranz/franz/commit/eea4801)), closes [#173](https://github.com/meetfranz/franz/issues/173) 149* **Windows:** Fix notifications on Windows 10 (Fall Creators Update) ([eea4801](https://github.com/meetfranz/franz/commit/eea4801))
125* **macOS:** Fix TouchBar related crash on macOS 10.12.1 and lower ([9e9a2ed](https://github.com/meetfranz/franz/commit/9e9a2ed)), closes [#70](https://github.com/meetfranz/franz/issues/70) 150* **macOS:** Fix TouchBar related crash on macOS 10.12.1 and lower ([9e9a2ed](https://github.com/meetfranz/franz/commit/9e9a2ed))
126* **App:** Add fallback to service menu when service name is empty ([42ed24d](https://github.com/meetfranz/franz/commit/42ed24d)), closes [#250](https://github.com/meetfranz/franz/issues/250) 151* **App:** Add fallback to service menu when service name is empty ([42ed24d](https://github.com/meetfranz/franz/commit/42ed24d))
127* **App:** Prevent app from redirecting when dropping link ([811a527](https://github.com/meetfranz/franz/commit/811a527)) ([dannyqiu](https://github.com/dannyqiu)) 152* **App:** Prevent app from redirecting when dropping link ([811a527](https://github.com/meetfranz/franz/commit/811a527)) ([dannyqiu](https://github.com/dannyqiu))
128* **Support with CPU:** Reduce maximum CPU usage ([64ad918](https://github.com/meetfranz/franz/commit/64ad918)), closes [#314](https://github.com/meetfranz/franz/issues/314) 153* **Support with CPU:** Reduce maximum CPU usage ([64ad918](https://github.com/meetfranz/franz/commit/64ad918))
129* **Hosted Services:** Do not strip www from custom service Url ([a764321](https://github.com/meetfranz/franz/commit/a764321)) ([BeneStem](https://github.com/BeneStem)) 154* **Hosted Services:** Do not strip www from custom service Url ([a764321](https://github.com/meetfranz/franz/commit/a764321)) ([BeneStem](https://github.com/BeneStem))
130* **Services:** Fix onNotify in service API ([b15421b](https://github.com/meetfranz/franz/commit/b15421b)) ([dannyqiu](https://github.com/dannyqiu)) 155* **Services:** Fix onNotify in service API ([b15421b](https://github.com/meetfranz/franz/commit/b15421b)) ([dannyqiu](https://github.com/dannyqiu))
131* **Sidebar:** Fix tabs reordering ([86413ba](https://github.com/meetfranz/franz/commit/86413ba)) ([josescgar](https://github.com/josescgar)) 156* **Sidebar:** Fix tabs reordering ([86413ba](https://github.com/meetfranz/franz/commit/86413ba)) ([josescgar](https://github.com/josescgar))
@@ -158,7 +183,7 @@ fix(App): Bugfix Fix memory leak in recipe polling loop
158* **Onboarding:** Fix issue with import of on-premise services ([7c7d27d](https://github.com/meetfranz/franz/commit/7c7d27d)) 183* **Onboarding:** Fix issue with import of on-premise services ([7c7d27d](https://github.com/meetfranz/franz/commit/7c7d27d))
159* **Shortcuts:** Flip shortcut to navigate to next/previous service ([37d5923](https://github.com/meetfranz/franz/commit/37d5923)) 184* **Shortcuts:** Flip shortcut to navigate to next/previous service ([37d5923](https://github.com/meetfranz/franz/commit/37d5923))
160* **Windows:** Open Window when app is pinned to taskbar and minimized to system tray ([777814a](https://github.com/meetfranz/franz/commit/777814a)) 185* **Windows:** Open Window when app is pinned to taskbar and minimized to system tray ([777814a](https://github.com/meetfranz/franz/commit/777814a))
161* **Recipes:** Recipe developers don't need Premium Supporter Account for debugging ([7a9947a](https://github.com/meetfranz/franz/commit/7a9947a)), closes [#23](https://github.com/meetfranz/franz/issues/23) 186* **Recipes:** Recipe developers don't need Premium Supporter Account for debugging ([7a9947a](https://github.com/meetfranz/franz/commit/7a9947a))
162 187
163 188
164 189
@@ -167,10 +192,10 @@ fix(App): Bugfix Fix memory leak in recipe polling loop
167 192
168### Features 193### Features
169 194
170* **Settings:** Add option to disable system tray icon ([c62f3fc](https://github.com/meetfranz/franz/commit/c62f3fc)), closes [#2](https://github.com/meetfranz/franz/issues/2) 195* **Settings:** Add option to disable system tray icon ([c62f3fc](https://github.com/meetfranz/franz/commit/c62f3fc))
171* **Service:** Display URL of hyperlinks ([a0cec4d](https://github.com/meetfranz/franz/commit/a0cec4d)), closes [#47](https://github.com/meetfranz/franz/issues/47) ([GustavoKatel](https://github.com/GustavoKatel)) 196* **Service:** Display URL of hyperlinks ([a0cec4d](https://github.com/meetfranz/franz/commit/a0cec4d)) ([GustavoKatel](https://github.com/GustavoKatel))
172* **App:** Add tab cycling with ctrl[+shift]+tab or ctrl+[pageup|pagedown] ([e58f558](https://github.com/meetfranz/franz/commit/ 197* **App:** Add tab cycling with ctrl[+shift]+tab or ctrl+[pageup|pagedown] ([e58f558](https://github.com/meetfranz/franz/commit/
173e58f558)), closes [#35](https://github.com/meetfranz/franz/issues/35) ([GustavoKatel](https://github.com/GustavoKatel)) 198e58f558)) ([GustavoKatel](https://github.com/GustavoKatel))
174* **Translation:** Add Brazilian Portuguese ([phmigotto](https://github.com/phmigotto)) 199* **Translation:** Add Brazilian Portuguese ([phmigotto](https://github.com/phmigotto))
175* **Translation:** Add Dutch ([cpeetersburg](https://github.com/cpeetersburg), [Blizzke](https://github.com/Blizzke)) 200* **Translation:** Add Dutch ([cpeetersburg](https://github.com/cpeetersburg), [Blizzke](https://github.com/Blizzke))
176* **Translation:** Add Flemish ([Blizzke](https://github.com/Blizzke), [mroeling](https://github.com/mroeling)) 201* **Translation:** Add Flemish ([Blizzke](https://github.com/Blizzke), [mroeling](https://github.com/mroeling))
@@ -184,10 +209,10 @@ e58f558)), closes [#35](https://github.com/meetfranz/franz/issues/35) ([GustavoK
184 209
185### Bug Fixes 210### Bug Fixes
186 211
187* **App:** Force Franz to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e)), closes [#29](https://github.com/meetfranz/franz/issues/29) 212* **App:** Force Franz to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e))
188* **Onboarding:** Fix enable/disable service import toggle ([23174f9](https://github.com/meetfranz/franz/commit/23174f9)) 213* **Onboarding:** Fix enable/disable service import toggle ([23174f9](https://github.com/meetfranz/franz/commit/23174f9))
189* **Onboarding:** Fix service import ([99d1c01](https://github.com/meetfranz/franz/commit/99d1c01)), closes [#22](https://github.com/meetfranz/franz/issues/22) 214* **Onboarding:** Fix service import ([99d1c01](https://github.com/meetfranz/franz/commit/99d1c01))
190* **Payment:** Fix payment window when name contains special character ([a854614](https://github.com/meetfranz/franz/commit/a854614)) 215* **Payment:** Fix payment window when name contains special character ([a854614](https://github.com/meetfranz/franz/commit/a854614))
191* **macOS:** Add macOS dark theme system tray icon ([55805f1](https://github.com/meetfranz/franz/commit/55805f1)), closes [#1](https://github.com/meetfranz/franz/issues/1) 216* **macOS:** Add macOS dark theme system tray icon ([55805f1](https://github.com/meetfranz/franz/commit/55805f1))
192* **Windows:** Fix enable/disable autostart on login ([eca7f3b](https://github.com/meetfranz/franz/commit/eca7f3b)), closes [#17](https://github.com/meetfranz/franz/issues/17) 217* **Windows:** Fix enable/disable autostart on login ([eca7f3b](https://github.com/meetfranz/franz/commit/eca7f3b))
193* **Windows:** Fix multiple system tray icons when opening/closing Franz ([5b9b0c7](https://github.com/meetfranz/franz/commit/5b9b0c7)) 218* **Windows:** Fix multiple system tray icons when opening/closing Franz ([5b9b0c7](https://github.com/meetfranz/franz/commit/5b9b0c7))
diff --git a/README.md b/README.md
index ff371b737..4d024c3be 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,11 @@ Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many mor
12## [Download Franz](https://www.meetfranz.com) 12## [Download Franz](https://www.meetfranz.com)
13👉 www.meetfranz.com 13👉 www.meetfranz.com
14 14
15### Or use homebrew (macOS only)
16
17`$ brew cask install franz`
18
19(Don't know homebrew? [brew.sh](https://brew.sh/)
15 20
16## Development 21## Development
17 22
diff --git a/docs/linux.md b/docs/linux.md
index bd70ad324..43ffa313b 100644
--- a/docs/linux.md
+++ b/docs/linux.md
@@ -7,5 +7,5 @@ $ apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev
7 7
8## Fedora 8## Fedora
9```bash 9```bash
10$ dnf-install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel 10$ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel
11``` 11```
diff --git a/package.json b/package.json
index 722037209..f184f2651 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
2 "name": "franz", 2 "name": "franz",
3 "productName": "Franz", 3 "productName": "Franz",
4 "appId": "com.meetfranz.franz", 4 "appId": "com.meetfranz.franz",
5 "version": "5.0.0-beta.18", 5 "version": "5.0.0-beta.19",
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": "adlk x franz - Stefan Malzner", 7 "copyright": "adlk x franz - Stefan Malzner",
8 "main": "index.js", 8 "main": "index.js",
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index ce7f89c42..e1423bdaa 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -43,7 +43,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
43 handleIPCMessage, 43 handleIPCMessage,
44 setWebviewReference, 44 setWebviewReference,
45 openWindow, 45 openWindow,
46 reloadUpdatedServices,
47 reorder, 46 reorder,
48 reload, 47 reload,
49 toggleNotifications, 48 toggleNotifications,
@@ -122,7 +121,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
122 services={servicesContainer} 121 services={servicesContainer}
123 news={news.latest} 122 news={news.latest}
124 removeNewsItem={hide} 123 removeNewsItem={hide}
125 reloadServicesAfterUpdate={reloadUpdatedServices} 124 reloadServicesAfterUpdate={() => window.location.reload()}
126 installAppUpdate={installUpdate} 125 installAppUpdate={installUpdate}
127 globalError={globalError.error} 126 globalError={globalError.error}
128 showRequiredRequestsError={requests.showRequiredRequestsError} 127 showRequiredRequestsError={requests.showRequiredRequestsError}
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 45335c488..6f156a96d 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -326,31 +326,6 @@ export default class AppStore extends Store {
326 defaultLocale, 326 defaultLocale,
327 fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale, 327 fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale,
328 }); 328 });
329
330 // if (locales[locale] === undefined) {
331 // let localeFuzzy;
332 // Object.keys(locales).forEach((localStr) => {
333 // if (locales && Object.hasOwnProperty.call(locales, localStr)) {
334 // if (locale.substring(0, 2) === localStr.substring(0, 2)) {
335 // localeFuzzy = localStr;
336 // }
337 // }
338 // });
339
340 // if (localeFuzzy !== undefined) {
341 // locale = localeFuzzy;
342 // }
343 // }
344
345 // if (locales[locale] === undefined) {
346 // locale = defaultLocale;
347 // }
348
349 // if (!locale) {
350 // locale = DEFAULT_APP_SETTINGS.fallbackLocale;
351 // }
352
353 // return locale;
354 } 329 }
355 330
356 _muteAppHandler() { 331 _muteAppHandler() {
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 9480e27ab..10c893d3f 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -22,12 +22,16 @@ export default class FeaturesStore extends Store {
22 setTimeout(this._enableFeatures.bind(this), 1); 22 setTimeout(this._enableFeatures.bind(this), 1);
23 } 23 }
24 24
25 @computed get anonymousFeatures() {
26 return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
27 }
28
25 @computed get features() { 29 @computed get features() {
26 if (this.stores.user.isLoggedIn) { 30 if (this.stores.user.isLoggedIn) {
27 return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG; 31 return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG;
28 } 32 }
29 33
30 return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG; 34 return DEFAULT_FEATURES_CONFIG;
31 } 35 }
32 36
33 _monitorLoginStatus() { 37 _monitorLoginStatus() {
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 61528ba2c..4c01e9910 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -176,10 +176,6 @@ export default class SettingsStore extends Store {
176 '5.0.0-beta.19-settings': true, 176 '5.0.0-beta.19-settings': true,
177 }, 177 },
178 }); 178 });
179
180 localStorage.removeItem('app');
181
182 debug('Set up dark mode');
183 } 179 }
184 } 180 }
185 181