From 3a449c20f72ad8a9fd54331b5dc3a5c92989d404 Mon Sep 17 00:00:00 2001 From: Amine Date: Thu, 23 Apr 2020 08:48:14 +0000 Subject: [PATCH] Release 5.5.0-gm.2 (#625) * Bump Electron to 8.2.3 for latest fixes * Bump version to 5.5.0-gm.2 * Update recipes submodule * Update changelog * Add support for external issue linking * Link README * Address regression introduced by #590 * Add new translations contributors * #620 Address broken translation * Fix cache clearing feedback US copy * Update changelog to include latest merged pull requests * Fix changelog format * Review branding of initial system notification on macOS * #569 Fix missing margin between tabs Co-authored-by: vantezzen --- .all-contributorsrc | 135 ++++++++++++++++++ CHANGELOG.md | 39 +++++ README.md | 135 +++++++++++------- package-lock.json | 82 +++++++---- package.json | 4 +- recipes | 2 +- .../settings/settings/EditSettingsForm.js | 2 +- src/i18n/locales/af.json | 2 +- src/i18n/locales/ar.json | 2 +- src/i18n/locales/bs.json | 2 +- src/i18n/locales/ca.json | 2 +- src/i18n/locales/cs.json | 2 +- src/i18n/locales/da.json | 2 +- src/i18n/locales/de.json | 2 +- src/i18n/locales/defaultMessages.json | 49 ++++--- src/i18n/locales/el.json | 2 +- src/i18n/locales/en-US.json | 2 +- src/i18n/locales/es.json | 2 +- src/i18n/locales/fi.json | 2 +- src/i18n/locales/fr.json | 2 +- src/i18n/locales/ga.json | 2 +- src/i18n/locales/he.json | 2 +- src/i18n/locales/hr.json | 2 +- src/i18n/locales/hu.json | 2 +- src/i18n/locales/id.json | 2 +- src/i18n/locales/it.json | 2 +- src/i18n/locales/ja.json | 2 +- src/i18n/locales/ka.json | 2 +- src/i18n/locales/ko.json | 2 +- src/i18n/locales/nl-BE.json | 2 +- src/i18n/locales/nl.json | 2 +- src/i18n/locales/no.json | 2 +- src/i18n/locales/pl.json | 2 +- src/i18n/locales/pt-BR.json | 2 +- src/i18n/locales/pt.json | 2 +- src/i18n/locales/ro.json | 2 +- src/i18n/locales/ru.json | 2 +- src/i18n/locales/sk.json | 2 +- src/i18n/locales/sl.json | 2 +- src/i18n/locales/sr.json | 2 +- src/i18n/locales/sv.json | 2 +- src/i18n/locales/tr.json | 2 +- src/i18n/locales/uk.json | 2 +- src/i18n/locales/vi.json | 2 +- src/i18n/locales/zh-HANT.json | 2 +- src/i18n/locales/zh.json | 2 +- .../settings/settings/EditSettingsForm.json | 49 ++++--- src/scripts/link-readme.js | 34 +++-- src/stores/AppStore.js | 2 +- src/styles/settings.scss | 2 + src/styles/tabs.scss | 2 +- 51 files changed, 436 insertions(+), 177 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 869da41d49..e5ae29a914 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -532,6 +532,141 @@ "contributions": [ "code" ] + }, + { + "login": "2bdelghafour", + "name": "2bdelghafour", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14219410/small/31ff20f60d352fb46e314f3c180a77b0.jpeg", + "profile": "https://crowdin.com/profile/2bdelghafour", + "contributions": [ + "translation" + ] + }, + { + "login": "abdoutanta", + "name": "Abderrahim Tantaoui", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14213908/small/5b2fc8166f8a0a2b7313fbf49ee5b6b6.jpeg", + "profile": "https://crowdin.com/profile/abdoutanta", + "contributions": [ + "translation" + ] + }, + { + "login": "AndiLeni", + "name": "AndiLeni", + "avatar_url": "https://www.gravatar.com/avatar/4bd0da860de38afa735425ce2d4e10b5", + "profile": "https://crowdin.com/profile/AndiLeni", + "contributions": [ + "translation" + ] + }, + { + "login": "brunofalmada", + "name": "Bruno Almada", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14200540/small/f6f1addceeeabc02488f9b08520a902f.jpeg", + "profile": "https://crowdin.com/profile/brunofalmada", + "contributions": [ + "translation" + ] + }, + { + "login": "Catarino", + "name": "Catarino Gonçalo", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14208802/small/07287eb2de671257ca3d6bb4ba1cca67.jpeg", + "profile": "https://crowdin.com/profile/Catarino", + "contributions": [ + "translation" + ] + }, + { + "login": "Alzemand", + "name": "Edilson Alzemand Sigmaringa Junior", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14184269/small/f5e68247f01988ae7951a282f0fd4d06.jpeg", + "profile": "https://crowdin.com/profile/Alzemand", + "contributions": [ + "translation" + ] + }, + { + "login": "MAT-OUT", + "name": "MAT-OUT", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14201550/small/68dd2402bf2879bc3ca312d627710400.png", + "profile": "https://crowdin.com/profile/MAT-OUT", + "contributions": [ + "translation" + ] + }, + { + "login": "mazzo98", + "name": "mazzo98", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/12864917/small/69799b5fd7be2f67282715d5cdfd4ae1.png", + "profile": "https://crowdin.com/profile/mazzo98", + "contributions": [ + "translation" + ] + }, + { + "login": "paprika-naught-tiffin-flyspeck", + "name": "paprika-naught-tiffin-flyspeck", + "avatar_url": "https://www.gravatar.com/avatar/8671ebe7a7164dfa7624fbdbff69ed96", + "profile": "https://crowdin.com/profile/paprika-naught-tiffin-flyspeck", + "contributions": [ + "translation" + ] + }, + { + "login": "patrickvalle", + "name": "Patrick Valle", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14217484/small/8b73f313ee79fe33625e819cdac86551.jpg", + "profile": "https://crowdin.com/profile/patrickvalle", + "contributions": [ + "translation" + ] + }, + { + "login": "peq42", + "name": "peq42_", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14155811/small/b62a94dde7ec29948ec6a6af9fd24b1d.png", + "profile": "https://crowdin.com/profile/peq42", + "contributions": [ + "translation" + ] + }, + { + "login": "karlinhos", + "name": "Pumbinha", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14161139/small/96450eb44c22b3141ab4401e547109b8.png", + "profile": "https://crowdin.com/profile/karlinhos", + "contributions": [ + "translation" + ] + }, + { + "login": "dies", + "name": "Serhiy Dmytryshyn", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/1/small/e84bcdf6c084ffd52527931f988fb410.png", + "profile": "https://crowdin.com/profile/dies", + "contributions": [ + "translation" + ] + }, + { + "login": "SMile61", + "name": "SMile61", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/14177585/small/1bb4f6ba39bff3df8f579e61460ce016.png", + "profile": "https://crowdin.com/profile/SMile61", + "contributions": [ + "translation" + ] + }, + { + "login": "tinect", + "name": "tinect", + "avatar_url": "https://crowdin-static.downloads.crowdin.com/avatar/12521988/small/56c2041645746af9e51dd28782b828c3.jpeg", + "profile": "https://crowdin.com/profile/tinect", + "contributions": [ + "translation" + ] } ], "contributorsPerLine": 6, diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f9f4d3b54..5086fb3b06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ - Add option to disable reload after resume (#442), 💖 @n0emis - Add custom JS/CSS to services (#83) - Add ability to change the services icons size and sidebar width (#153) +- Differentiate between indirect and direct notifications (#590), 💖 @Room4O4 @mahadevans87 @FeikoJoosten @sampathBlam +- Add setting to keep service in hibernation after startup (#577, #584) ### Minor changes - Improve user onboarding (#493) @@ -33,6 +35,19 @@ - Add better support for macOS dark mode - Add better seperation in settings - Change Sentry telemetry to be opt-in only (#160) +- Remove excess code from Franz's hibernate feature (#609) +- Refocus Webview only for active service (#610), 💖 @Room4O4 & @mahadevans87 +- Use GitHub notifications center and direct notifications (getferdi/recipes#133) +- Switch back to original Telegram, add Telegram React (getferdi/recipes#132) +- Fix notifications for various services, 💖 @FeikoJoosten +- Add support for indirect messages for various services, 💖 @FeikoJoosten +- Use correct Riot icon (getferdi/recipes#125), 💖 @halms +- Remove incorrectly placed icons (getferdi/recipes#126), 💖 @halms +- Fix slack draft notifications (getferdi/recipes#127), 💖 @Serubin +- Remove automatic reloading from WhatsApp +- Update Microsoft Teams to allow Desktop Sharing (getferdi/recipes#116), 💖 @Gautasmi +- Organize settings with horizontal tabs (#569), 💖 @yourcontact +- Improve cache clearing UI feedback (#620), 💖 @saruwman ### Bug fixes - Fix cache clearing not working in Windows 10 (#541, #544), 💖 @Room4O4 & @mahadevans87 @@ -49,11 +64,35 @@ - Fix login problems in Google services - Fix Dark Reader blocking services from loading (#285) - Fix incorrect body closing tag (#330), 💖 @jereksel +- Fix DarkReader translation problem (#593) ### Build changes - Add retry commands to flaky build steps (#498) - Run utility scripts pre-commit instead of pre-push (#515) +# [5.5.0-gm.2](https://github.com/getferdi/ferdi/compare/v5.5.0-gm...v5.5.0-gm.2) (2020-04-22) +### Features +- Differentiate between indirect and direct notifications (#590), 💖 @Room4O4 @mahadevans87 @FeikoJoosten @sampathBlam +- Add setting to keep service in hibernation after startup (#577, #584) + +### Minor changes +- Remove excess code from Franz's hibernate feature (#609) +- Refocus Webview only for active service (#610), 💖 @Room4O4 & @mahadevans87 +- Use GitHub notifications center and direct notifications (getferdi/recipes#133) +- Switch back to original Telegram, add Telegram React (getferdi/recipes#132) +- Fix notifications for various services, 💖 @FeikoJoosten +- Add support for indirect messages for various services, 💖 @FeikoJoosten +- Use correct Riot icon (getferdi/recipes#125), 💖 @halms +- Remove incorrectly placed icons (getferdi/recipes#126), 💖 @halms +- Fix slack draft notifications (getferdi/recipes#127), 💖 @Serubin +- Remove automatic reloading from WhatsApp +- Update Microsoft Teams to allow Desktop Sharing (getferdi/recipes#116), 💖 @Gautasmi +- Organize settings with horizontal tabs (#569), 💖 @yourcontact +- Improve cache clearing UI feedback (#620), 💖 @saruwman + +### Bug Fixes +- Fix DarkReader translation problem (#593) + ## [5.5.0-gm](https://github.com/getferdi/ferdi/compare/v5.4.4-beta.3...v5.5.0-gm) (2020-04-15) ### Features - Merge Franz 5.5.0-beta.2 diff --git a/README.md b/README.md index d3d1fd4470..bf3f18ea70 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,7 @@

GitHub Releases - -Contributors - +Contributors Open Collective backers Open Collective sponsors Build Status Windows @@ -119,12 +117,14 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`. - [x] Adds an option to keep individual workspaces always loaded ([#37](https://github.com/getferdi/ferdi/issues/37)) - [x] Adds "Quick Switch" feature to help you navigate a long list of services (similar to Rambox's [Quick Switcher](https://rambox.pro/#feature-details/quick_switcher)) - [x] Adds "Service Hibernation" that will automatically unload services when they are unused to keep your computer running fast +- [x] Adds a setting to keep service in hibernation after startup ([#577](https://github.com/getferdi/ferdi/issues/577), [#584](https://github.com/getferdi/ferdi/issues/584)) - [x] [Add `user.css` and `user.js` that allows users to inject custom code into services](https://github.com/getferdi/ferdi/wiki/Using-user.css-and-user.js) ([#83](https://github.com/getferdi/ferdi/issues/83)) - [x] Adds Process Manager to find services using a lot of resources - [x] Adds CTRL+← and CTRL+→ shortcuts and menu options to go back and forward in the service browsing history([#39](https://github.com/getferdi/ferdi/issues/39)) - [x] Adds "Scheduled Do-not-Disturb" feature in which you won't get notifications (similar to Rambox's [Work Hours](https://rambox.pro/#feature-details/work_hours)) - [x] Allows you to [use any Todo service inside "Franz Todo" panel](https://github.com/getferdi/ferdi/wiki/Custom-Todo) (e.g. Todoist via https://todoist.com/app) instead of being limited to using Franz Todo - [x] Adds a dropdown list to choose your Todo service ([#418](https://github.com/getferdi/ferdi/issues/418), [#477](https://github.com/getferdi/ferdi/issues/477)), 💖 [@yourcontact](https://github.com/yourcontact) +- [x] Differentiates between indirect and direct notifications ([#590](https://github.com/getferdi/ferdi/issues/590)), 💖 [@Room4O4](https://github.com/Room4O4) [@mahadevans87](https://github.com/mahadevans87) [@FeikoJoosten](https://github.com/FeikoJoosten) [@sampathBlam](https://github.com/sampathBlam) ### Adds features to improve your privacy - [x] [Adds option to change server to a custom](https://github.com/getferdi/ferdi/wiki/Custom-Server) [ferdi-server](https://github.com/getferdi/server) @@ -164,6 +164,8 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`. - [x] Adds better separation in settings - [x] Adds various other UI improvements - [x] Improves documentation of development so more developers can help making Ferdi even better +- [x] Updates Microsoft Teams to allow Desktop Sharing ([getferdi/recipes#116](https://github.com/getferdi/recipes/issues/116)), 💖 [@Gautasmi](https://github.com/Gautasmi) +- [x] Removes automatic reloading from WhatsApp ### Removed bugs - [x] Fixes bug that would incorrectly display unread messages count on some services (more info in [7566ccd](https://github.com/getferdi/ferdi/commit/7566ccd)) @@ -174,6 +176,8 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`. - [x] Fixes microphone/camera access on some versions of macOS ([#193](https://github.com/getferdi/ferdi/issues/193)) - [x] Fixes cache clearing not working in Windows 10 ([#541](https://github.com/getferdi/ferdi/issues/541), [#544](https://github.com/getferdi/ferdi/issues/544)), 💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87) - [x] Fixes Home button in navigation bar not correctly navigating ([#571](https://github.com/getferdi/ferdi/issues/571), [#573](https://github.com/getferdi/ferdi/issues/573)), 💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87) +- [x] Fixes notifications for various services, 💖 [@FeikoJoosten](https://github.com/FeikoJoosten) +- [x] Refocuses Webview only for active service ([#610](https://github.com/getferdi/ferdi/issues/610)), 💖 [@Room4O4](https://github.com/Room4O4) & [@mahadevans87](https://github.com/mahadevans87) ### Adds new platforms - [x] Adds portable version for Windows so you can use Ferdi without even installing it, 💖 [@Makazzz](https://github.com/Makazzz) @@ -298,74 +302,95 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + +

Bennett
💻 🎨 📖 🤔 🌍 💡 🐛 🖋 🚇 📓 💬 📆 👀
Amine Mouafik
💻 🎨 📖 🤔 🐛 🖋 🚇 📓 💬 📆 👀 🚧 📦 🔍 📝 🌍
Stefan Malzner
💻 🖋 🎨 📖 🤔 🚇 📆 ⚠️ 🌍
Makazzz
🐛 💻 🌍 🖋 📖 📦
ZeroCool
💻 🤔
rseitbekov
💻		Bennett
Bennett
💻 🎨 📖 🤔 🌍 💡 🐛 🖋 🚇 📓 💬 📆 👀		Amine Mouafik
Amine Mouafik
💻 🎨 📖 🤔 🐛 🖋 🚇 📓 💬 📆 👀 🚧 📦 🔍 📝 🌍		Stefan Malzner
Stefan Malzner
💻 🖋 🎨 📖 🤔 🚇 📆 ⚠️ 🌍		Makazzz
Makazzz
🐛 💻 🌍 🖋 📖 📦		ZeroCool
ZeroCool
💻 🤔		rseitbekov
rseitbekov
💻

Peter Bittner
🤔 🐛
Justus Saul
🐛 🤔
igreil
🤔
Marco Lopes
🤔
dayzlun
🐛
Tobias Günther
🤔		Peter Bittner
Peter Bittner
🤔 🐛		Justus Saul
Justus Saul
🐛 🤔		igreil
igreil
🤔		Marco Lopes
Marco Lopes
🤔		dayzlun
dayzlun
🐛		Tobias Günther
Tobias Günther
🤔

AGCaesar
📦
xthursdayx
💻 📖 🚇 📦
Gaboris
💬 🐛
Ce
🐛
Stanislav N.
🐛
Patrick Curl
🤔		AGCaesar
AGCaesar
📦		xthursdayx
xthursdayx
💻 📖 🚇 📦		Gaboris
Gaboris
💬 🐛		Ce
Ce
🐛		Stanislav N.
Stanislav N.
🐛		Patrick Curl
Patrick Curl
🤔

Benjamin Staneck
🎨
ammarmalhas
🐛 🛡️
Steliyan Stoyanov
💻 🤔
Bror Winther
📖
Felix W. Dekker
📖
Sauceee
🎨		Benjamin Staneck
Benjamin Staneck
🎨		ammarmalhas
ammarmalhas
🐛 🛡️		Steliyan Stoyanov
Steliyan Stoyanov
💻 🤔		Bror Winther
Bror Winther
📖		Felix W. Dekker
Felix W. Dekker
📖		Sauceee
Sauceee
🎨

Lennart Weller
📦
Andrzej Ressel
💻
Daniel Peukert
💻
Ali M. Shiple
🌍
elviseras
🌍
J370
🌍		Lennart Weller
Lennart Weller
📦		Andrzej Ressel
Andrzej Ressel
💻		Daniel Peukert
Daniel Peukert
💻		Ali M. Shiple
Ali M. Shiple
🌍		elviseras
elviseras
🌍		J370
J370
🌍

Koen
🌍
Leandro Gehlen
🌍
Matthieu42
🌍
Nikita Bibanaev
🌍
Tatjana1998
🌍
tinect
🌍		Koen
Koen
🌍		Leandro Gehlen
Leandro Gehlen
🌍		Matthieu42
Matthieu42
🌍		Nikita Bibanaev
Nikita Bibanaev
🌍		Tatjana1998
Tatjana1998
🌍		tinect
tinect
🌍

Wonsup Yoon
🌍
zutt
🌍
n0emis
💻 🌍
gmarec
💻
127oo1
🌍
ChTBoner
🌍		Wonsup Yoon
Wonsup Yoon
🌍		zutt
zutt
🌍		n0emis
n0emis
💻 🌍		gmarec
gmarec
💻		127oo1
127oo1
🌍		ChTBoner
ChTBoner
🌍

Johan Engstrand
🌍
Marouane R
💻
Roman
💻
Mahadevan Sreenivasan
💻 🤔 👀
Jake Lee
🖋
Sampath Kumar Krishnan
💻 👀		Johan Engstrand
Johan Engstrand
🌍		Marouane R
Marouane R
💻		Roman
Roman
💻		Mahadevan Sreenivasan
Mahadevan Sreenivasan
💻 🤔 👀		Jake Lee
Jake Lee
🖋		Sampath Kumar Krishnan
Sampath Kumar Krishnan
💻 👀

saruwman
📖 💻
dorukkarinca
🐛
Gautam Singh
💻
Feiko Joosten
💻		saruwman
saruwman
📖 💻		dorukkarinca
dorukkarinca
🐛		Gautam Singh
Gautam Singh
💻		Feiko Joosten
Feiko Joosten
💻		2bdelghafour
2bdelghafour
🌍		Abderrahim Tantaoui
Abderrahim Tantaoui
🌍
AndiLeni
AndiLeni
🌍		Bruno Almada
Bruno Almada
🌍		Catarino Gonçalo
Catarino Gonçalo
🌍		Edilson Alzemand Sigmaringa Junior
Edilson Alzemand Sigmaringa Junior
🌍		MAT-OUT
MAT-OUT
🌍		mazzo98
mazzo98
🌍
paprika-naught-tiffin-flyspeck
paprika-naught-tiffin-flyspeck
🌍		Patrick Valle
Patrick Valle
🌍		peq42_
peq42_
🌍		Pumbinha
Pumbinha
🌍		Serhiy Dmytryshyn
Serhiy Dmytryshyn
🌍		SMile61
SMile61
🌍
tinect
tinect
🌍
diff --git a/package-lock.json b/package-lock.json index b1aa4e88d4..f117141f51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.4.4-beta.3", + "version": "5.5.0-gm.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2592,9 +2592,9 @@ } }, "@electron/get": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.9.0.tgz", - "integrity": "sha512-OBIKtF6ttIJotDXe4KJMUyTBO4xMii+mFjlA8R4CORuD4HvCUaCK3lPjhdTRCvuEv6gzWNbAvd9DNBv0v780lw==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.10.0.tgz", + "integrity": "sha512-hlueNXU51c3CwQjBw/i5fwt+VfQgSQVUTdicpCHkhEjNZaa4CXJ5W1GaxSwtLE2dvRmAHjpIjUMHTqJ53uojfg==", "dev": true, "requires": { "debug": "^4.1.1", @@ -7106,6 +7106,12 @@ "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "dev": true + }, "buffer-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", @@ -9815,9 +9821,9 @@ "dev": true }, "electron": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-8.1.1.tgz", - "integrity": "sha512-t+5zzFo7VOgckJc9YpImHJkpqeWxwpmEjywWbAa4IT5MULS7h1XU52H9gMswK/y8xc5lBNwxLhJSty/15+gi1A==", + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/electron/-/electron-8.2.3.tgz", + "integrity": "sha512-FJUp103c8yJBoAaj/QM/OBde57iJh95u1yGJBytMUXmLFSsx78LmNE03QN4XCODyzi76IEcasvUcK6scogRLbQ==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -11973,15 +11979,15 @@ } }, "extract-zip": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", - "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", + "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "debug": "2.6.9", - "mkdirp": "0.5.1", - "yauzl": "2.4.1" + "concat-stream": "^1.6.2", + "debug": "^2.6.9", + "mkdirp": "^0.5.4", + "yauzl": "^2.10.0" }, "dependencies": { "debug": { @@ -11993,6 +11999,21 @@ "ms": "2.0.0" } }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -12092,9 +12113,9 @@ } }, "fd-slicer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", - "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", "dev": true, "requires": { "pend": "~1.2.0" @@ -13864,16 +13885,16 @@ }, "dependencies": { "core-js": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", - "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==", + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", + "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", "dev": true, "optional": true }, "semver": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz", - "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true, "optional": true } @@ -23507,9 +23528,9 @@ "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=" }, "roarr": { - "version": "2.15.2", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.2.tgz", - "integrity": "sha512-jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q==", + "version": "2.15.3", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz", + "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==", "dev": true, "optional": true, "requires": { @@ -27910,12 +27931,13 @@ } }, "yauzl": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", - "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", "dev": true, "requires": { - "fd-slicer": "~1.0.1" + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" } }, "yeast": { diff --git a/package.json b/package.json index 2da8f6b9db..8134be3853 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ferdi", "productName": "Ferdi", "appId": "com.kytwb.ferdi", - "version": "5.5.0-gm", + "version": "5.5.0-gm.2", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "kytwb", "main": "index.js", @@ -158,7 +158,7 @@ "cross-env": "^5.0.5", "cz-conventional-changelog": "2.1.0", "dotenv": "^4.0.0", - "electron": "8.1.1", + "electron": "8.2.3", "electron-builder": "22.4.1", "electron-notarize": "0.2.1", "electron-rebuild": "1.10.0", diff --git a/recipes b/recipes index 803c7eb1b6..911d1ded84 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 803c7eb1b65ad793513aaba56df507bc820959a6 +Subproject commit 911d1ded846165a4b420efa2b58668ad27c9f2c7 diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 7876232985..8faea708bb 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -101,7 +101,7 @@ const messages = defineMessages({ }, cacheNotCleared: { id: 'settings.app.cacheNotCleared', - defaultMessage: 'Couldn\'t clear all cache', + defaultMessage: '!!!Couldn\'t clear all cache', }, buttonClearAllCache: { id: 'settings.app.buttonClearAllCache', diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json index 3b5da1306f..9d676c0a9a 100644 --- a/src/i18n/locales/af.json +++ b/src/i18n/locales/af.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index a162bd0e87..88f970da9f 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json index 3b5da1306f..9d676c0a9a 100644 --- a/src/i18n/locales/bs.json +++ b/src/i18n/locales/bs.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json index 0305f3bf11..b0e8d2ded4 100644 --- a/src/i18n/locales/ca.json +++ b/src/i18n/locales/ca.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json index 40843e0fac..136602524c 100644 --- a/src/i18n/locales/cs.json +++ b/src/i18n/locales/cs.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json index 3b5da1306f..9d676c0a9a 100644 --- a/src/i18n/locales/da.json +++ b/src/i18n/locales/da.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index eb335af8f9..38772d36a2 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "Mit Ferdi Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.", "workspaceDrawer.workspacesSettingsTooltip": "Workspaces bearbeiten", "workspaces.switchingIndicator.switchingTo": "Wechsle zu" -} \ No newline at end of file +} diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index c2ead2a48b..c80574aa85 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -3293,120 +3293,133 @@ } }, { - "defaultMessage": "!!!Clear cache", + "defaultMessage": "!!!Couldn't clear all cache", "end": { "column": 3, "line": 105 }, "file": "src/components/settings/settings/EditSettingsForm.js", + "id": "settings.app.cacheNotCleared", + "start": { + "column": 19, + "line": 102 + } + }, + { + "defaultMessage": "!!!Clear cache", + "end": { + "column": 3, + "line": 109 + }, + "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonClearAllCache", "start": { "column": 23, - "line": 102 + "line": 106 } }, { "defaultMessage": "!!!Check for updates", "end": { "column": 3, - "line": 109 + "line": 113 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonSearchForUpdate", "start": { "column": 25, - "line": 106 + "line": 110 } }, { "defaultMessage": "!!!Restart & install update", "end": { "column": 3, - "line": 113 + "line": 117 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonInstallUpdate", "start": { "column": 23, - "line": 110 + "line": 114 } }, { "defaultMessage": "!!!Is searching for update", "end": { "column": 3, - "line": 117 + "line": 121 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusSearching", "start": { "column": 25, - "line": 114 + "line": 118 } }, { "defaultMessage": "!!!Update available, downloading...", "end": { "column": 3, - "line": 121 + "line": 125 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusAvailable", "start": { "column": 25, - "line": 118 + "line": 122 } }, { "defaultMessage": "!!!You are using the latest version of Ferdi", "end": { "column": 3, - "line": 125 + "line": 129 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusUpToDate", "start": { "column": 24, - "line": 122 + "line": 126 } }, { "defaultMessage": "!!!Current version:", "end": { "column": 3, - "line": 129 + "line": 133 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.currentVersion", "start": { "column": 18, - "line": 126 + "line": 130 } }, { "defaultMessage": "!!!Changes require restart", "end": { "column": 3, - "line": 133 + "line": 137 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.restartRequired", "start": { "column": 29, - "line": 130 + "line": 134 } }, { "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "end": { "column": 3, - "line": 137 + "line": 141 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.languageDisclaimer", "start": { "column": 22, - "line": 134 + "line": 138 } } ], diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json index 1db2054b4a..88fe5a81db 100644 --- a/src/i18n/locales/el.json +++ b/src/i18n/locales/el.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 1800626cf3..5c33daf864 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index afee5d9e75..a8518b5e35 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json index 3b5da1306f..9d676c0a9a 100644 --- a/src/i18n/locales/fi.json +++ b/src/i18n/locales/fi.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index c2b0e764b1..c898f47f2f 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Les Espaces de travail de Ferdi vous permettant de rester concentré sur ce qui est important. Créez différents groupes de services et naviguez facilement entre eux à n'importe quel moment.

Vous décidez de quels services vous avez besoin, où et quand, ainsi nous pouvons vous aider à rester concentré sur votre travail - ou à le quitter dès que vous le souhaitez.

", "workspaceDrawer.workspacesSettingsTooltip": "Éditer les paramètres de l'espace de travail", "workspaces.switchingIndicator.switchingTo": "Changement vers" -} \ No newline at end of file +} diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json index 386a9889d1..d930ab4156 100644 --- a/src/i18n/locales/ga.json +++ b/src/i18n/locales/ga.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index 3b5da1306f..9d676c0a9a 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json index e509e2f624..79616f9f52 100644 --- a/src/i18n/locales/hr.json +++ b/src/i18n/locales/hr.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json index 35cfebcd83..07603df52c 100644 --- a/src/i18n/locales/hu.json +++ b/src/i18n/locales/hu.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

A Ferdi Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. Állítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor.

Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.

", "workspaceDrawer.workspacesSettingsTooltip": "Munkaterület beállítások szerkesztése", "workspaces.switchingIndicator.switchingTo": "Váltás" -} \ No newline at end of file +} diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json index 44578f0b47..433fde2293 100644 --- a/src/i18n/locales/id.json +++ b/src/i18n/locales/id.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ruang Kerja Ferdi dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain.

Anda yang memutuskan layanan mana yang Anda perlukan dan kapan, agar kami bisa membantu Anda tetap berada di garis depan - atau dengan mudah mengakhiri hari kerja kapan saja Anda inginkan.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit setelan ruang kerja", "workspaces.switchingIndicator.switchingTo": "Beralih ke" -} \ No newline at end of file +} diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index 80e12041c3..78474b4962 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

I workspace di Ferdi ti permettono di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi.

Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.

", "workspaceDrawer.workspacesSettingsTooltip": "Modifica le impostazioni dei workspace", "workspaces.switchingIndicator.switchingTo": "Passa a " -} \ No newline at end of file +} diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index c1350f4fcb..3c8f938aa7 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json index 4f381b8471..3768274ff8 100644 --- a/src/i18n/locales/ka.json +++ b/src/i18n/locales/ka.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json index 9a2c684d83..4629905477 100644 --- a/src/i18n/locales/ko.json +++ b/src/i18n/locales/ko.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json index 707de9999c..f166fd1c94 100644 --- a/src/i18n/locales/nl-BE.json +++ b/src/i18n/locales/nl-BE.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Pas werkruimte instellingen aan", "workspaces.switchingIndicator.switchingTo": "Overschakelen naar" -} \ No newline at end of file +} diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json index 05c18f32e5..3ac8186bd3 100644 --- a/src/i18n/locales/nl.json +++ b/src/i18n/locales/nl.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "Ferdi werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van services aan en schakel wanneer je wilt tussen de verschillende sets. Jij beslist welke services je wanneer en waar nodig hebt. Zo helpen wij jou je focus te behouden - of net zo gemakkelijk te switchen van werk naar ontspanning.", "workspaceDrawer.workspacesSettingsTooltip": "Werkruimte instellingen aanpassen", "workspaces.switchingIndicator.switchingTo": "Overschakelen naar" -} \ No newline at end of file +} diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json index 3b5da1306f..9d676c0a9a 100644 --- a/src/i18n/locales/no.json +++ b/src/i18n/locales/no.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json index fcf2ab8ef1..f6193a1fd3 100644 --- a/src/i18n/locales/pl.json +++ b/src/i18n/locales/pl.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie.

Decyduj, które usługi potrzebujesz , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.

", "workspaceDrawer.workspacesSettingsTooltip": "Edytuj ustawienia obszaru roboczego", "workspaces.switchingIndicator.switchingTo": "Przełącz do" -} \ No newline at end of file +} diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index 0c09d50aff..892b05b669 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

As áreas de trabalho do Ferdi te ajuda a focar no que realmente é importante agora. Configure diferente cenários para serviços e mude entre eles facilmente em qualquer momento.

Você decide quais serviços precisa e onde deseja posicioná-los, e então nós iremos te ajudar em aumentar a sua produtividade. Você pode desligar os serviços que não são úteis para você.

", "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações das áreas de trabalho", "workspaces.switchingIndicator.switchingTo": "Trocando para" -} \ No newline at end of file +} diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index 5fdde294f9..7a6ed77cc5 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

As áreas de trabalho do Ferdi permitem que se concentre no que realmente é importante. Configure diferentes conjuntos de serviços e mude-os facilmente e a qualquer momento.

Você decide quais os serviços que precisa e onde colocá-los, para que o possamos ajudar a estar no seu melhor. - Ou desligar do trabalho quando quiser.

", "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações das áreas de trabalho", "workspaces.switchingIndicator.switchingTo": "A mudar para" -} \ No newline at end of file +} diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json index 3b5da1306f..9d676c0a9a 100644 --- a/src/i18n/locales/ro.json +++ b/src/i18n/locales/ro.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index 796ffff79c..a16bde739b 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json index 5c1aa88fbb..fd73bc773f 100644 --- a/src/i18n/locales/sk.json +++ b/src/i18n/locales/sk.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspace vám umožňujú sústrediť sa na to, čo je práve dôležité. Nastavte si rozličné skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte.

Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na čokoľvek iné.

", "workspaceDrawer.workspacesSettingsTooltip": "Upraviť nastavenia workspace", "workspaces.switchingIndicator.switchingTo": "Prepínanie na" -} \ No newline at end of file +} diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json index 3b5da1306f..9d676c0a9a 100644 --- a/src/i18n/locales/sl.json +++ b/src/i18n/locales/sl.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json index be6a441064..33cde814ce 100644 --- a/src/i18n/locales/sr.json +++ b/src/i18n/locales/sr.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index 8d3c39839f..418624a668 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi-arbetsytor låter dig fokusera på det som är viktigt just nu. Konfigurera olika uppsättningar av tjänster och växla enkelt mellan dem när som helst.

Du bestämmer vilka tjänster du behöver när och var, så att vi kan hjälpa dig att hålla koll på läget - eller enkelt koppla bort från jobbet när du vill.

", "workspaceDrawer.workspacesSettingsTooltip": "Redigera inställningar för arbetsytor", "workspaces.switchingIndicator.switchingTo": "Byter till" -} \ No newline at end of file +} diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json index 1f683a8ef4..428d9f18fa 100644 --- a/src/i18n/locales/tr.json +++ b/src/i18n/locales/tr.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index e05eae0a44..25e09ea49e 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json index 3b5da1306f..9d676c0a9a 100644 --- a/src/i18n/locales/vi.json +++ b/src/i18n/locales/vi.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json index 80e13b2568..3bba232fde 100644 --- a/src/i18n/locales/zh-HANT.json +++ b/src/i18n/locales/zh-HANT.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "切換到" -} \ No newline at end of file +} diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index c4b6689fdc..2c7b75e42d 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -525,4 +525,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json index cdc6ded7ea..97360b78e7 100644 --- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json +++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json @@ -259,16 +259,29 @@ "column": 3 } }, + { + "id": "settings.app.cacheNotCleared", + "defaultMessage": "!!!Couldn't clear all cache", + "file": "src/components/settings/settings/EditSettingsForm.js", + "start": { + "line": 102, + "column": 19 + }, + "end": { + "line": 105, + "column": 3 + } + }, { "id": "settings.app.buttonClearAllCache", "defaultMessage": "!!!Clear cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 102, + "line": 106, "column": 23 }, "end": { - "line": 105, + "line": 109, "column": 3 } }, @@ -277,11 +290,11 @@ "defaultMessage": "!!!Check for updates", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 106, + "line": 110, "column": 25 }, "end": { - "line": 109, + "line": 113, "column": 3 } }, @@ -290,11 +303,11 @@ "defaultMessage": "!!!Restart & install update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 110, + "line": 114, "column": 23 }, "end": { - "line": 113, + "line": 117, "column": 3 } }, @@ -303,11 +316,11 @@ "defaultMessage": "!!!Is searching for update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 114, + "line": 118, "column": 25 }, "end": { - "line": 117, + "line": 121, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Update available, downloading...", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 118, + "line": 122, "column": 25 }, "end": { - "line": 121, + "line": 125, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!You are using the latest version of Ferdi", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 122, + "line": 126, "column": 24 }, "end": { - "line": 125, + "line": 129, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!Current version:", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 126, + "line": 130, "column": 18 }, "end": { - "line": 129, + "line": 133, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Changes require restart", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 130, + "line": 134, "column": 29 }, "end": { - "line": 133, + "line": 137, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 134, + "line": 138, "column": 22 }, "end": { - "line": 137, + "line": 141, "column": 3 } } diff --git a/src/scripts/link-readme.js b/src/scripts/link-readme.js index 223451d84e..694b897007 100644 --- a/src/scripts/link-readme.js +++ b/src/scripts/link-readme.js @@ -18,26 +18,36 @@ let readme = fs.readFileSync(readmepath, 'utf-8'); let replacements = 0; -// Replace Ferdi issues -// Regex matches strings that don't begin with a "[", i.e. are not already linked and -// don't begin with "franz", i.e. are not Franz issues, followed by a "#" and 3 digits to indicate -// a GitHub issue, and not ending with a "]" -readme = readme.replace(/(? { - const issueNr = match.replace('#', ''); - replacements += 1; - return `[#${issueNr}](https://github.com/getferdi/ferdi/issues/${issueNr})`; -}); - // Replace Franz issues // Regex matches strings that don't begin with a "[", i.e. are not already linked -// followed by a "franz#" and 3 digits to indicate +// followed by a "franz#" and digits to indicate // a GitHub issue, and not ending with a "]" -readme = readme.replace(/(? { +readme = readme.replace(/(? { const issueNr = match.replace('franz#', ''); replacements += 1; return `[franz#${issueNr}](https://github.com/meetfranz/franz/issues/${issueNr})`; }); +// Replace external issues +// Regex matches strings that don't begin with a "[", followed a repo name in the format "user/repo" +// followed by a "#" and digits to indicate a GitHub issue, and not ending with a "]" +readme = readme.replace(/(? { + const issueNr = match.replace(/\D/g, ''); + const repo = match.replace(/#\d+/g, ''); + replacements += 1; + return `[${repo}#${issueNr}](https://github.com/${repo}/issues/${issueNr})`; +}); + +// Replace Ferdi issues +// Regex matches strings that don't begin with a "[", i.e. are not already linked and +// don't begin with "franz", i.e. are not Franz issues, followed by a "#" and digits to indicate +// a GitHub issue, and not ending with a "]" +readme = readme.replace(/(? { + const issueNr = match.replace('#', ''); + replacements += 1; + return `[#${issueNr}](https://github.com/getferdi/ferdi/issues/${issueNr})`; +}); + // Link GitHub users // Regex matches strings that don't begin with a "[", i.e. are not already linked // followed by a "@" and at least one word character and not ending with a "]" diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index da6055e5f7..96142787e9 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js @@ -222,7 +222,7 @@ export default class AppStore extends Store { if (!localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) { debug('Triggering macOS Catalina notification permission trigger'); // eslint-disable-next-line no-new - new window.Notification('Welcome to Franz 5', { + new window.Notification('Welcome to Ferdi 5', { body: 'Have a wonderful day & happy messaging.', }); diff --git a/src/styles/settings.scss b/src/styles/settings.scss index 580917fe27..dab48ef0b3 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss @@ -197,6 +197,8 @@ overflow-y: scroll; padding: 25px 15px 15px 25px; + .badge { margin-right: 10px; } + &::-webkit-scrollbar { width: 8px; } /* Track */ diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss index 65ca97a54f..d09353e385 100644 --- a/src/styles/tabs.scss +++ b/src/styles/tabs.scss @@ -52,7 +52,7 @@ .tab-item__message-count { align-items: center; - background: #0088cc; + background: $theme-brand-danger; border-radius: 20px; bottom: 8px; color: #FFF;