diff options
-rw-r--r-- | README.md | 8 | ||||
-rw-r--r-- | src/config.js | 10 | ||||
-rw-r--r-- | src/scripts/add-crowdin-contributors.js | 2 |
3 files changed, 10 insertions, 10 deletions
@@ -53,12 +53,12 @@ | |||
53 | 53 | ||
54 | ### What is Ferdi? | 54 | ### What is Ferdi? |
55 | 55 | ||
56 | Ferdi is a messaging browser that allows you to combine your favorite messaging services into one application. It is based on Franz - a software already used by thousands of people - with the difference that Ferdi gives you many additonal features and doesn't restrict its usage! Ferdi is compatible with your existing Franz account so you can continue right where you left off. Find out more about Ferdi and its features on [getferdi.com](https://getferdi.com). | 56 | Ferdi is a messaging browser that allows you to combine your favorite messaging services into one application. It is based on Franz - a software already used by thousands of people - with the difference that Ferdi gives you many additional features and doesn't restrict its usage! Ferdi is compatible with your existing Franz account so you can continue right where you left off. Find out more about Ferdi and its features on [getferdi.com](https://getferdi.com). |
57 | 57 | ||
58 | ## Features | 58 | ## Features |
59 | - [x] Ferdi puts all your messaging services into one place | 59 | - [x] Ferdi puts all your messaging services into one place |
60 | - [x] Native support for 100+ services | 60 | - [x] Native support for 100+ services |
61 | - [x] Workspaces to keep your personal and work life seperated | 61 | - [x] Workspaces to keep your personal and work life separated |
62 | - [x] Support for multiple accounts on any service | 62 | - [x] Support for multiple accounts on any service |
63 | - [x] Dark Mode support for all of your services | 63 | - [x] Dark Mode support for all of your services |
64 | - [x] Optional cloud sync to keep your services synchronized between devices | 64 | - [x] Optional cloud sync to keep your services synchronized between devices |
@@ -98,7 +98,7 @@ You can download Ferdi for Windows, Mac and Linux on [Ferdi's download page](htt | |||
98 | 98 | ||
99 | ### Or use AUR (Arch Linux) | 99 | ### Or use AUR (Arch Linux) |
100 | 100 | ||
101 | Ferdi has three seperate AUR packages you can use: | 101 | Ferdi has three separate AUR packages you can use: |
102 | - **[ferdi](https://aur.archlinux.org/packages/ferdi/)**: Uses your system electron version to run the latest release - this version will work best on most systems. | 102 | - **[ferdi](https://aur.archlinux.org/packages/ferdi/)**: Uses your system electron version to run the latest release - this version will work best on most systems. |
103 | - **[ferdi-bin](https://aur.archlinux.org/packages/ferdi-bin/)**: Uses the latest Fedora release and extracts it to Arch. Use this version if you are having trouble with the `ferdi` package. | 103 | - **[ferdi-bin](https://aur.archlinux.org/packages/ferdi-bin/)**: Uses the latest Fedora release and extracts it to Arch. Use this version if you are having trouble with the `ferdi` package. |
104 | - **[ferdi-git](https://aur.archlinux.org/packages/ferdi-git/)**: Uses your system electron version to run the latest commit from the develop branch and may be unstable but may also give you features that are not yet available in other versions. Please only use `ferdi-git` if you accept these risks. | 104 | - **[ferdi-git](https://aur.archlinux.org/packages/ferdi-git/)**: Uses your system electron version to run the latest commit from the develop branch and may be unstable but may also give you features that are not yet available in other versions. Please only use `ferdi-git` if you accept these risks. |
@@ -152,7 +152,7 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`. | |||
152 | - [x] Adds better support for macOS dark mode | 152 | - [x] Adds better support for macOS dark mode |
153 | - [x] Adds option to disable reload of services after resuming Ferdi ([#442](https://github.com/getferdi/ferdi/issues/442)) | 153 | - [x] Adds option to disable reload of services after resuming Ferdi ([#442](https://github.com/getferdi/ferdi/issues/442)) |
154 | - [x] Comes with a custom branding proper to Ferdi | 154 | - [x] Comes with a custom branding proper to Ferdi |
155 | - [x] Adds better seperation in settings | 155 | - [x] Adds better separation in settings |
156 | - [x] Adds various other UI improvements | 156 | - [x] Adds various other UI improvements |
157 | - [x] Improves documentation of development so more developers can help making Ferdi even better | 157 | - [x] Improves documentation of development so more developers can help making Ferdi even better |
158 | 158 | ||
diff --git a/src/config.js b/src/config.js index bde710d44..45b840b0a 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -36,13 +36,13 @@ export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12'; | |||
36 | export const KEEP_WS_LOADED_USID = '0a0aa000-0a0a-49a0-a000-a0a0a0a0a0a0'; | 36 | export const KEEP_WS_LOADED_USID = '0a0aa000-0a0a-49a0-a000-a0a0a0a0a0a0'; |
37 | 37 | ||
38 | export const HIBERNATION_STRATEGIES = { | 38 | export const HIBERNATION_STRATEGIES = { |
39 | 10: 'Extemely Fast Hibernation (10sec)', | 39 | 10: 'Extremely Fast Hibernation (10sec)', |
40 | 30: 'Very Fast Hibernation (30sec)', | 40 | 30: 'Very Fast Hibernation (30sec)', |
41 | 60: 'Fast Hibernation (1min)', | 41 | 60: 'Fast Hibernation (1min)', |
42 | 300: 'Normal Hibernation (5min)', | 42 | 300: 'Normal Hibernation (5min)', |
43 | 600: 'Slow Hibernation (10min)', | 43 | 600: 'Slow Hibernation (10min)', |
44 | 1800: 'Very Slow Hibernation (30min)', | 44 | 1800: 'Very Slow Hibernation (30min)', |
45 | 3600: 'Extemely Slow Hibernation (1hour)', | 45 | 3600: 'Extremely Slow Hibernation (1hour)', |
46 | }; | 46 | }; |
47 | 47 | ||
48 | export const NAVIGATION_BAR_BEHAVIOURS = { | 48 | export const NAVIGATION_BAR_BEHAVIOURS = { |
@@ -64,13 +64,13 @@ export const TODO_APPS = { | |||
64 | }; | 64 | }; |
65 | 65 | ||
66 | export const SIDEBAR_WIDTH = { | 66 | export const SIDEBAR_WIDTH = { |
67 | 35: 'Extemely slim sidebar', | 67 | 35: 'Extremely slim sidebar', |
68 | 45: 'Very slim sidebar', | 68 | 45: 'Very slim sidebar', |
69 | 55: 'Slim sidebar', | 69 | 55: 'Slim sidebar', |
70 | 68: 'Normal sidebar', | 70 | 68: 'Normal sidebar', |
71 | 80: 'Wide sidebar', | 71 | 80: 'Wide sidebar', |
72 | 90: 'Very wide sidebar', | 72 | 90: 'Very wide sidebar', |
73 | 100: 'Extemely wide sidebar', | 73 | 100: 'Extremely wide sidebar', |
74 | }; | 74 | }; |
75 | 75 | ||
76 | export const ICON_SIZES = { | 76 | export const ICON_SIZES = { |
@@ -179,7 +179,7 @@ if (process.env.FERDI_APPDATA_DIR != null) { | |||
179 | 179 | ||
180 | export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); | 180 | export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); |
181 | 181 | ||
182 | // Replacing app.asar is not beautiful but unforunately necessary | 182 | // Replacing app.asar is not beautiful but unfortunately necessary |
183 | export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes')); | 183 | export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes')); |
184 | 184 | ||
185 | export const ALLOWED_PROTOCOLS = [ | 185 | export const ALLOWED_PROTOCOLS = [ |
diff --git a/src/scripts/add-crowdin-contributors.js b/src/scripts/add-crowdin-contributors.js index 7ad3df0ed..efe981b6e 100644 --- a/src/scripts/add-crowdin-contributors.js +++ b/src/scripts/add-crowdin-contributors.js | |||
@@ -22,7 +22,7 @@ membersEl.forEach((el) => { | |||
22 | let picture = el.querySelector('img').getAttribute('src'); | 22 | let picture = el.querySelector('img').getAttribute('src'); |
23 | picture = picture.replace(/\?.+/, ''); | 23 | picture = picture.replace(/\?.+/, ''); |
24 | 24 | ||
25 | // Check if the text includes a seperate username | 25 | // Check if the text includes a separate username |
26 | if (text.includes('(')) { | 26 | if (text.includes('(')) { |
27 | const username = /(?<=\()\w*(?=\))/.exec(text)[0]; | 27 | const username = /(?<=\()\w*(?=\))/.exec(text)[0]; |
28 | const name = /^.*(?= \()/.exec(text)[0]; | 28 | const name = /^.*(?= \()/.exec(text)[0]; |