diff options
author | Travis CI <travis@Traviss-Mac.local> | 2021-02-08 21:44:19 +0000 |
---|---|---|
committer | Travis CI <travis@Traviss-Mac.local> | 2021-02-08 21:44:19 +0000 |
commit | 0d0d3a51e98a9bcb1d8c14724ecd318f770adb68 (patch) | |
tree | 067673ed58c8a6d191a5b792a295fa53f5c8d532 /src/config.js | |
parent | 5.6.0-nightly.15 and trigger AppVeyor nightly build [skip travisci] (diff) | |
parent | Bump electron from 10.1.3 to 10.2.0 (#1194) (diff) | |
download | ferdium-app-0d0d3a51e98a9bcb1d8c14724ecd318f770adb68.tar.gz ferdium-app-0d0d3a51e98a9bcb1d8c14724ecd318f770adb68.tar.zst ferdium-app-0d0d3a51e98a9bcb1d8c14724ecd318f770adb68.zip |
Merge remote-tracking branch 'source/develop' into HEAD [skip ci]
Diffstat (limited to 'src/config.js')
-rw-r--r-- | src/config.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/config.js b/src/config.js index eb6f08be9..03d201425 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -31,6 +31,8 @@ export const LOCAL_TODOS_FRONTEND_URL = 'http://localhost:4000'; | |||
31 | export const PRODUCTION_TODOS_FRONTEND_URL = 'https://app.franztodos.com'; | 31 | export const PRODUCTION_TODOS_FRONTEND_URL = 'https://app.franztodos.com'; |
32 | export const DEVELOPMENT_TODOS_FRONTEND_URL = 'https://development--franz-todos.netlify.com'; | 32 | export const DEVELOPMENT_TODOS_FRONTEND_URL = 'https://development--franz-todos.netlify.com'; |
33 | 33 | ||
34 | export const CDN_URL = 'https://cdn.franzinfra.com'; | ||
35 | |||
34 | export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12'; | 36 | export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12'; |
35 | 37 | ||
36 | export const KEEP_WS_LOADED_USID = '0a0aa000-0a0a-49a0-a000-a0a0a0a0a0a0'; | 38 | export const KEEP_WS_LOADED_USID = '0a0aa000-0a0a-49a0-a000-a0a0a0a0a0a0'; |
@@ -100,7 +102,7 @@ export const DEFAULT_APP_SETTINGS = { | |||
100 | showMessageBadgeWhenMuted: true, | 102 | showMessageBadgeWhenMuted: true, |
101 | showDragArea: false, | 103 | showDragArea: false, |
102 | enableSpellchecking: true, | 104 | enableSpellchecking: true, |
103 | spellcheckerLanguage: '["en-US"]', | 105 | spellcheckerLanguage: 'en-us', |
104 | darkMode: process.platform === 'darwin' ? nativeTheme.shouldUseDarkColors : false, // We can't use refs from `./environment` at this time | 106 | darkMode: process.platform === 'darwin' ? nativeTheme.shouldUseDarkColors : false, // We can't use refs from `./environment` at this time |
105 | locale: '', | 107 | locale: '', |
106 | fallbackLocale: 'en-US', | 108 | fallbackLocale: 'en-US', |
@@ -193,6 +195,7 @@ export const ALLOWED_PROTOCOLS = [ | |||
193 | 'https:', | 195 | 'https:', |
194 | 'http:', | 196 | 'http:', |
195 | 'ftp:', | 197 | 'ftp:', |
198 | 'franz:', | ||
196 | ]; | 199 | ]; |
197 | 200 | ||
198 | export const PLANS = { | 201 | export const PLANS = { |