aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Amine Mouafik <amine@mouafik.fr>2020-10-04 10:02:10 +0100
committerLibravatar GitHub <noreply@github.com>2020-10-04 10:02:10 +0100
commit484846786ecf19c9c22794fe81d922af025ab4a4 (patch)
tree96996b85743d98af6cbd009c5eef13cb039c46cd /src
parentFix "Open folder" button on "Custom services" screen (#991) (diff)
downloadferdium-app-484846786ecf19c9c22794fe81d922af025ab4a4.tar.gz
ferdium-app-484846786ecf19c9c22794fe81d922af025ab4a4.tar.zst
ferdium-app-484846786ecf19c9c22794fe81d922af025ab4a4.zip
Fix macOS code signing and setup automatic nightly builds (#990)
Co-authored-by: Travis CI <travis@Traviss-Mac.local> Co-authored-by: vantezzen <hello@vantezzen.io>
Diffstat (limited to 'src')
-rw-r--r--src/i18n/languages.js2
-rw-r--r--src/i18n/locales/defaultMessages.json48
-rw-r--r--src/index.js4
m---------src/internal-server0
4 files changed, 27 insertions, 27 deletions
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 2576051af..64ba5719f 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -26,7 +26,7 @@ export const APP_LOCALES = {
26 'zh-TW': '台語 (Chinese Taiwan)', 26 'zh-TW': '台語 (Chinese Taiwan)',
27 es: 'Español', 27 es: 'Español',
28 no: 'Norsk (Norwegian)', 28 no: 'Norsk (Norwegian)',
29 be: 'белар (Belarusian)' 29 be: 'белар (Belarusian)',
30}; 30};
31 31
32// Hunspell compatible keys 32// Hunspell compatible keys
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index ce78f34a3..58f37ebad 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2953,117 +2953,117 @@
2953 "defaultMessage": "!!!Your services", 2953 "defaultMessage": "!!!Your services",
2954 "end": { 2954 "end": {
2955 "column": 3, 2955 "column": 3,
2956 "line": 18 2956 "line": 19
2957 }, 2957 },
2958 "file": "src/components/settings/services/ServicesDashboard.js", 2958 "file": "src/components/settings/services/ServicesDashboard.js",
2959 "id": "settings.services.headline", 2959 "id": "settings.services.headline",
2960 "start": { 2960 "start": {
2961 "column": 12, 2961 "column": 12,
2962 "line": 15 2962 "line": 16
2963 } 2963 }
2964 }, 2964 },
2965 { 2965 {
2966 "defaultMessage": "!!!Search service", 2966 "defaultMessage": "!!!Search service",
2967 "end": { 2967 "end": {
2968 "column": 3, 2968 "column": 3,
2969 "line": 22 2969 "line": 23
2970 }, 2970 },
2971 "file": "src/components/settings/services/ServicesDashboard.js", 2971 "file": "src/components/settings/services/ServicesDashboard.js",
2972 "id": "settings.searchService", 2972 "id": "settings.searchService",
2973 "start": { 2973 "start": {
2974 "column": 17, 2974 "column": 17,
2975 "line": 19 2975 "line": 20
2976 } 2976 }
2977 }, 2977 },
2978 { 2978 {
2979 "defaultMessage": "!!!You haven't added any services yet.", 2979 "defaultMessage": "!!!You haven't added any services yet.",
2980 "end": { 2980 "end": {
2981 "column": 3, 2981 "column": 3,
2982 "line": 26 2982 "line": 27
2983 }, 2983 },
2984 "file": "src/components/settings/services/ServicesDashboard.js", 2984 "file": "src/components/settings/services/ServicesDashboard.js",
2985 "id": "settings.services.noServicesAdded", 2985 "id": "settings.services.noServicesAdded",
2986 "start": { 2986 "start": {
2987 "column": 19, 2987 "column": 19,
2988 "line": 23 2988 "line": 24
2989 } 2989 }
2990 }, 2990 },
2991 { 2991 {
2992 "defaultMessage": "!!!Sorry, but no service matched your search term.", 2992 "defaultMessage": "!!!Sorry, but no service matched your search term.",
2993 "end": { 2993 "end": {
2994 "column": 3, 2994 "column": 3,
2995 "line": 30 2995 "line": 31
2996 }, 2996 },
2997 "file": "src/components/settings/services/ServicesDashboard.js", 2997 "file": "src/components/settings/services/ServicesDashboard.js",
2998 "id": "settings.recipes.nothingFound", 2998 "id": "settings.recipes.nothingFound",
2999 "start": { 2999 "start": {
3000 "column": 18, 3000 "column": 18,
3001 "line": 27 3001 "line": 28
3002 } 3002 }
3003 }, 3003 },
3004 { 3004 {
3005 "defaultMessage": "!!!Discover services", 3005 "defaultMessage": "!!!Discover services",
3006 "end": { 3006 "end": {
3007 "column": 3, 3007 "column": 3,
3008 "line": 34 3008 "line": 35
3009 }, 3009 },
3010 "file": "src/components/settings/services/ServicesDashboard.js", 3010 "file": "src/components/settings/services/ServicesDashboard.js",
3011 "id": "settings.services.discoverServices", 3011 "id": "settings.services.discoverServices",
3012 "start": { 3012 "start": {
3013 "column": 20, 3013 "column": 20,
3014 "line": 31 3014 "line": 32
3015 } 3015 }
3016 }, 3016 },
3017 { 3017 {
3018 "defaultMessage": "!!!Could not load your services", 3018 "defaultMessage": "!!!Could not load your services",
3019 "end": { 3019 "end": {
3020 "column": 3, 3020 "column": 3,
3021 "line": 38 3021 "line": 39
3022 }, 3022 },
3023 "file": "src/components/settings/services/ServicesDashboard.js", 3023 "file": "src/components/settings/services/ServicesDashboard.js",
3024 "id": "settings.services.servicesRequestFailed", 3024 "id": "settings.services.servicesRequestFailed",
3025 "start": { 3025 "start": {
3026 "column": 25, 3026 "column": 25,
3027 "line": 35 3027 "line": 36
3028 } 3028 }
3029 }, 3029 },
3030 { 3030 {
3031 "defaultMessage": "!!!Try again", 3031 "defaultMessage": "!!!Try again",
3032 "end": { 3032 "end": {
3033 "column": 3, 3033 "column": 3,
3034 "line": 42 3034 "line": 43
3035 }, 3035 },
3036 "file": "src/components/settings/services/ServicesDashboard.js", 3036 "file": "src/components/settings/services/ServicesDashboard.js",
3037 "id": "settings.account.tryReloadServices", 3037 "id": "settings.account.tryReloadServices",
3038 "start": { 3038 "start": {
3039 "column": 21, 3039 "column": 21,
3040 "line": 39 3040 "line": 40
3041 } 3041 }
3042 }, 3042 },
3043 { 3043 {
3044 "defaultMessage": "!!!Your changes have been saved", 3044 "defaultMessage": "!!!Your changes have been saved",
3045 "end": { 3045 "end": {
3046 "column": 3, 3046 "column": 3,
3047 "line": 46 3047 "line": 47
3048 }, 3048 },
3049 "file": "src/components/settings/services/ServicesDashboard.js", 3049 "file": "src/components/settings/services/ServicesDashboard.js",
3050 "id": "settings.services.updatedInfo", 3050 "id": "settings.services.updatedInfo",
3051 "start": { 3051 "start": {
3052 "column": 15, 3052 "column": 15,
3053 "line": 43 3053 "line": 44
3054 } 3054 }
3055 }, 3055 },
3056 { 3056 {
3057 "defaultMessage": "!!!Service has been deleted", 3057 "defaultMessage": "!!!Service has been deleted",
3058 "end": { 3058 "end": {
3059 "column": 3, 3059 "column": 3,
3060 "line": 50 3060 "line": 51
3061 }, 3061 },
3062 "file": "src/components/settings/services/ServicesDashboard.js", 3062 "file": "src/components/settings/services/ServicesDashboard.js",
3063 "id": "settings.services.deletedInfo", 3063 "id": "settings.services.deletedInfo",
3064 "start": { 3064 "start": {
3065 "column": 15, 3065 "column": 15,
3066 "line": 47 3066 "line": 48
3067 } 3067 }
3068 } 3068 }
3069 ], 3069 ],
@@ -5968,39 +5968,39 @@
5968 "defaultMessage": "!!!Franz Todos are available to premium users now!", 5968 "defaultMessage": "!!!Franz Todos are available to premium users now!",
5969 "end": { 5969 "end": {
5970 "column": 3, 5970 "column": 3,
5971 "line": 30 5971 "line": 34
5972 }, 5972 },
5973 "file": "src/features/todos/components/TodosWebview.js", 5973 "file": "src/features/todos/components/TodosWebview.js",
5974 "id": "feature.todos.premium.info", 5974 "id": "feature.todos.premium.info",
5975 "start": { 5975 "start": {
5976 "column": 15, 5976 "column": 15,
5977 "line": 27 5977 "line": 31
5978 } 5978 }
5979 }, 5979 },
5980 { 5980 {
5981 "defaultMessage": "!!!Upgrade Account", 5981 "defaultMessage": "!!!Upgrade Account",
5982 "end": { 5982 "end": {
5983 "column": 3, 5983 "column": 3,
5984 "line": 34 5984 "line": 38
5985 }, 5985 },
5986 "file": "src/features/todos/components/TodosWebview.js", 5986 "file": "src/features/todos/components/TodosWebview.js",
5987 "id": "feature.todos.premium.upgrade", 5987 "id": "feature.todos.premium.upgrade",
5988 "start": { 5988 "start": {
5989 "column": 14, 5989 "column": 14,
5990 "line": 31 5990 "line": 35
5991 } 5991 }
5992 }, 5992 },
5993 { 5993 {
5994 "defaultMessage": "!!!Everyone else will have to wait a little longer.", 5994 "defaultMessage": "!!!Everyone else will have to wait a little longer.",
5995 "end": { 5995 "end": {
5996 "column": 3, 5996 "column": 3,
5997 "line": 38 5997 "line": 42
5998 }, 5998 },
5999 "file": "src/features/todos/components/TodosWebview.js", 5999 "file": "src/features/todos/components/TodosWebview.js",
6000 "id": "feature.todos.premium.rollout", 6000 "id": "feature.todos.premium.rollout",
6001 "start": { 6001 "start": {
6002 "column": 15, 6002 "column": 15,
6003 "line": 35 6003 "line": 39
6004 } 6004 }
6005 } 6005 }
6006 ], 6006 ],
diff --git a/src/index.js b/src/index.js
index 66ae3ad00..1f482b12a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -53,7 +53,7 @@ import userAgent from './helpers/userAgent-helpers';
53 53
54const debug = require('debug')('Ferdi:App'); 54const debug = require('debug')('Ferdi:App');
55 55
56// From Electron 9 onwards, app.allowRendererProcessReuse = true by default. This causes the app to crash on Windows due to the 56// From Electron 9 onwards, app.allowRendererProcessReuse = true by default. This causes the app to crash on Windows due to the
57// Electron Windows Notification API crashing. Setting this to false fixes the issue until the electron team fixes the notification bug 57// Electron Windows Notification API crashing. Setting this to false fixes the issue until the electron team fixes the notification bug
58// More Info - https://github.com/electron/electron/issues/18397 58// More Info - https://github.com/electron/electron/issues/18397
59if (isWindows) { 59if (isWindows) {
@@ -333,7 +333,7 @@ const createWindow = () => {
333 333
334 app.mainWindow = mainWindow; 334 app.mainWindow = mainWindow;
335 app.isMaximized = mainWindow.isMaximized(); 335 app.isMaximized = mainWindow.isMaximized();
336 336
337 mainWindow.webContents.on('new-window', (e, url) => { 337 mainWindow.webContents.on('new-window', (e, url) => {
338 debug('Open url', url); 338 debug('Open url', url);
339 e.preventDefault(); 339 e.preventDefault();
diff --git a/src/internal-server b/src/internal-server
Subproject 95ae59926dbd88d55a5377be997558a9e112ab4 Subproject ae1edff6d5139e5912a8f99dac8da274add7fd7