From e8d7e7c1044ae1c7680ab0c675c6004590ae0791 Mon Sep 17 00:00:00 2001 From: Konrad Kleine <193408+kwk@users.noreply.github.com> Date: Tue, 20 Nov 2018 16:10:15 +0100 Subject: Fix typo: `dnf-install` has to be `dnf install` (#1125) --- docs/linux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ## Fedora ```bash -$ dnf-install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel +$ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel ``` -- cgit v1.2.3-70-g09d2 From e998c17b60bbe6e94ea360eb5cef70b9e6261b5b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 1 Dec 2018 14:44:11 +0100 Subject: Bump version to beta 19 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index db5f70c70..a894d65f0 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "franz", "productName": "Franz", "appId": "com.meetfranz.franz", - "version": "5.0.0-beta.18", + "version": "5.0.0-beta.19", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "adlk x franz - Stefan Malzner", "main": "index.js", -- cgit v1.2.3-70-g09d2 From 56f6da6b7c38dcd30e982e0007db919d8c1ba048 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 1 Dec 2018 20:49:44 +0100 Subject: Remove unnecessary code --- src/stores/AppStore.js | 25 ------------------------- src/stores/SettingsStore.js | 3 --- 2 files changed, 28 deletions(-) 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 { defaultLocale, fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale, }); - - // if (locales[locale] === undefined) { - // let localeFuzzy; - // Object.keys(locales).forEach((localStr) => { - // if (locales && Object.hasOwnProperty.call(locales, localStr)) { - // if (locale.substring(0, 2) === localStr.substring(0, 2)) { - // localeFuzzy = localStr; - // } - // } - // }); - - // if (localeFuzzy !== undefined) { - // locale = localeFuzzy; - // } - // } - - // if (locales[locale] === undefined) { - // locale = defaultLocale; - // } - - // if (!locale) { - // locale = DEFAULT_APP_SETTINGS.fallbackLocale; - // } - - // return locale; } _muteAppHandler() { diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 4a42ed924..f91ad5a12 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -180,9 +180,6 @@ export default class SettingsStore extends Store { }, }); - localStorage.removeItem('app'); - - debug('Set up dark mode'); } } -- cgit v1.2.3-70-g09d2 From 4996cccc05f588695698083fcbd020651251c7d1 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 1 Dec 2018 20:56:12 +0100 Subject: Do a complete app reload after service update This will immediately update the module that is running in Franz as well. --- src/containers/layout/AppLayoutContainer.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 handleIPCMessage, setWebviewReference, openWindow, - reloadUpdatedServices, reorder, reload, toggleNotifications, @@ -122,7 +121,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e services={servicesContainer} news={news.latest} removeNewsItem={hide} - reloadServicesAfterUpdate={reloadUpdatedServices} + reloadServicesAfterUpdate={() => window.location.reload()} installAppUpdate={installUpdate} globalError={globalError.error} showRequiredRequestsError={requests.showRequiredRequestsError} -- cgit v1.2.3-70-g09d2 From e15eeff3e99aa98289d98ae9f0debedb23020233 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 1 Dec 2018 20:56:19 +0100 Subject: fix linting issues --- src/stores/SettingsStore.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index f91ad5a12..9ea14a911 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -179,7 +179,6 @@ export default class SettingsStore extends Store { '5.0.0-beta.19-settings': true, }, }); - } } -- cgit v1.2.3-70-g09d2 From 3d235897a61b684c6147331342a235df151a980b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 1 Dec 2018 21:08:14 +0100 Subject: split features into features and anonymousFeatures --- src/stores/FeaturesStore.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 { setTimeout(this._enableFeatures.bind(this), 1); } + @computed get anonymousFeatures() { + return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG; + } + @computed get features() { if (this.stores.user.isLoggedIn) { return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG; } - return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG; + return DEFAULT_FEATURES_CONFIG; } _monitorLoginStatus() { -- cgit v1.2.3-70-g09d2 From 614d4fd8344665b78675c83c401a2ffdf6ddd988 Mon Sep 17 00:00:00 2001 From: Niels Bom Date: Sat, 1 Dec 2018 22:12:30 +0100 Subject: Add instruction to install Franz with homebrew (#1134) --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 5163fe46f..012a30fc9 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,11 @@ Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many mor ## [Download Franz](https://www.meetfranz.com) 👉 www.meetfranz.com +### Or use homebrew (macOS only) + +`$ brew cask install franz` + +(Don't know homebrew? [brew.sh](https://brew.sh/) ## Development -- cgit v1.2.3-70-g09d2 From 8ee6fdcbcc9656688145e718ff55eed4a16ff928 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sun, 2 Dec 2018 15:18:15 +0100 Subject: Update changelog --- CHANGELOG.md | 59 ++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38cba0829..c03d1a8ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,28 @@ + +# [5.0.0-beta.19](https://github.com/meetfranz/franz/compare/v5.0.0-beta.18...v5.0.0-beta.19) (2018-12-02) + +### General + +* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** + +### Features + +* **App:** 👉 Dark Mode 👈 ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f)) 🙌 [@guillecura](https://github.com/guillecura) +* **App:** Add proxy support for services ([6297274](https://github.com/meetfranz/franz/commit/6297274)) +* **App:** New spell checker ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e)) +* **App:** New context menu ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e)) +* **App:** Lay groundwork for general themeing support ([4ea044a](https://github.com/meetfranz/franz/commit/4ea044a)) +* **App:** Add option to enable dark mode for supported services ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f)) + +### Bug Fixes + +* **App:** App menu was not initialized on app launch. Resolving copy & paste issues for login. ([72d4164](https://github.com/meetfranz/franz/commit/72d4164)) +* **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)) +* **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)) +* **Windows:** Fix impossible Ctrl+10 Shortcut ([0db7c12](https://github.com/meetfranz/franz/commit/0db7c12)) +* **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)) + + # [5.0.0-beta.18](https://github.com/meetfranz/franz/compare/v5.0.0-beta.16...v5.0.0-beta.18) (2018-04-03) @@ -95,11 +120,11 @@ fix(App): Bugfix Fix memory leak in recipe polling loop * **Notification:** Remove notification sound when app is muted ([53fde0c](https://github.com/meetfranz/franz/commit/53fde0c)) * **Recipes:** Enable `urlInputPrefix` for team and customURL ([873957d](https://github.com/meetfranz/franz/commit/873957d)) * **Services:** Ctrl/Cmd+R now navigates back to the service root ([7293492](https://github.com/meetfranz/franz/commit/7293492)) -* **Services:** Fix transparent service background ([ed0098f](https://github.com/meetfranz/franz/commit/ed0098f)), closes [#361](https://github.com/meetfranz/franz/issues/361) +* **Services:** Fix transparent service background ([ed0098f](https://github.com/meetfranz/franz/commit/ed0098f)) * **Shortcuts:** Fixed settings shortcut inconsistency ([ca74846](https://github.com/meetfranz/franz/commit/ca74846)) * **Spell checker:** Fixed issues with spell checker ([965fdf2](https://github.com/meetfranz/franz/commit/965fdf2)) * **Translations:** Re-add Spanish to available languages. ([ad936f2](https://github.com/meetfranz/franz/commit/ad936f2)) -* **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) +* **Windows:** Open window when clicking on toast notification ([b82bbc8](https://github.com/meetfranz/franz/commit/b82bbc8)) @@ -110,9 +135,9 @@ fix(App): Bugfix Fix memory leak in recipe polling loop * **App:** Add link to changelog in app update notification ([2cbd938](https://github.com/meetfranz/franz/commit/2cbd938)) * **App:** Add option to enable/disable spell checker ([dcab45a](https://github.com/meetfranz/franz/commit/dcab45a)) -* **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) -* **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) -* **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) +* **App:** Add option to mute all services in sidebar ([f5a9aa2](https://github.com/meetfranz/franz/commit/f5a9aa2)) +* **App:** Decrease minimum window size to 600px width ([2521621](https://github.com/meetfranz/franz/commit/2521621)) +* **App:** Respect System DoNotDisturb mode for service audio ([7d41227](https://github.com/meetfranz/franz/commit/7d41227)) * **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff)) * **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1)) * **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 ### Bug Fixes -* **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) -* **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) -* **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) +* **Windows:** Fix notifications on Windows 10 (Fall Creators Update) ([eea4801](https://github.com/meetfranz/franz/commit/eea4801)) +* **macOS:** Fix TouchBar related crash on macOS 10.12.1 and lower ([9e9a2ed](https://github.com/meetfranz/franz/commit/9e9a2ed)) +* **App:** Add fallback to service menu when service name is empty ([42ed24d](https://github.com/meetfranz/franz/commit/42ed24d)) * **App:** Prevent app from redirecting when dropping link ([811a527](https://github.com/meetfranz/franz/commit/811a527)) ([dannyqiu](https://github.com/dannyqiu)) -* **Support with CPU:** Reduce maximum CPU usage ([64ad918](https://github.com/meetfranz/franz/commit/64ad918)), closes [#314](https://github.com/meetfranz/franz/issues/314) +* **Support with CPU:** Reduce maximum CPU usage ([64ad918](https://github.com/meetfranz/franz/commit/64ad918)) * **Hosted Services:** Do not strip www from custom service Url ([a764321](https://github.com/meetfranz/franz/commit/a764321)) ([BeneStem](https://github.com/BeneStem)) * **Services:** Fix onNotify in service API ([b15421b](https://github.com/meetfranz/franz/commit/b15421b)) ([dannyqiu](https://github.com/dannyqiu)) * **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 * **Onboarding:** Fix issue with import of on-premise services ([7c7d27d](https://github.com/meetfranz/franz/commit/7c7d27d)) * **Shortcuts:** Flip shortcut to navigate to next/previous service ([37d5923](https://github.com/meetfranz/franz/commit/37d5923)) * **Windows:** Open Window when app is pinned to taskbar and minimized to system tray ([777814a](https://github.com/meetfranz/franz/commit/777814a)) -* **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) +* **Recipes:** Recipe developers don't need Premium Supporter Account for debugging ([7a9947a](https://github.com/meetfranz/franz/commit/7a9947a)) @@ -167,10 +192,10 @@ fix(App): Bugfix Fix memory leak in recipe polling loop ### Features -* **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) -* **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)) +* **Settings:** Add option to disable system tray icon ([c62f3fc](https://github.com/meetfranz/franz/commit/c62f3fc)) +* **Service:** Display URL of hyperlinks ([a0cec4d](https://github.com/meetfranz/franz/commit/a0cec4d)) ([GustavoKatel](https://github.com/GustavoKatel)) * **App:** Add tab cycling with ctrl[+shift]+tab or ctrl+[pageup|pagedown] ([e58f558](https://github.com/meetfranz/franz/commit/ -e58f558)), closes [#35](https://github.com/meetfranz/franz/issues/35) ([GustavoKatel](https://github.com/GustavoKatel)) +e58f558)) ([GustavoKatel](https://github.com/GustavoKatel)) * **Translation:** Add Brazilian Portuguese ([phmigotto](https://github.com/phmigotto)) * **Translation:** Add Dutch ([cpeetersburg](https://github.com/cpeetersburg), [Blizzke](https://github.com/Blizzke)) * **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 ### Bug Fixes -* **App:** Force Franz to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e)), closes [#29](https://github.com/meetfranz/franz/issues/29) +* **App:** Force Franz to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e)) * **Onboarding:** Fix enable/disable service import toggle ([23174f9](https://github.com/meetfranz/franz/commit/23174f9)) -* **Onboarding:** Fix service import ([99d1c01](https://github.com/meetfranz/franz/commit/99d1c01)), closes [#22](https://github.com/meetfranz/franz/issues/22) +* **Onboarding:** Fix service import ([99d1c01](https://github.com/meetfranz/franz/commit/99d1c01)) * **Payment:** Fix payment window when name contains special character ([a854614](https://github.com/meetfranz/franz/commit/a854614)) -* **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) -* **Windows:** Fix enable/disable autostart on login ([eca7f3b](https://github.com/meetfranz/franz/commit/eca7f3b)), closes [#17](https://github.com/meetfranz/franz/issues/17) +* **macOS:** Add macOS dark theme system tray icon ([55805f1](https://github.com/meetfranz/franz/commit/55805f1)) +* **Windows:** Fix enable/disable autostart on login ([eca7f3b](https://github.com/meetfranz/franz/commit/eca7f3b)) * **Windows:** Fix multiple system tray icons when opening/closing Franz ([5b9b0c7](https://github.com/meetfranz/franz/commit/5b9b0c7)) -- cgit v1.2.3-70-g09d2