diff options
-rw-r--r-- | src/api/utils/auth.js | 10 | ||||
-rw-r--r-- | src/components/services/content/ConnectionLostBanner.js | 2 | ||||
-rw-r--r-- | src/components/services/tabs/TabItem.js | 2 | ||||
-rw-r--r-- | src/config.js | 2 | ||||
-rw-r--r-- | src/electron/ipc-api/cld.js | 2 | ||||
-rw-r--r-- | src/electron/ipc-api/dnd.js | 2 | ||||
-rw-r--r-- | src/electron/macOSPermissions.js | 5 | ||||
-rw-r--r-- | src/features/planSelection/api.js | 2 | ||||
-rw-r--r-- | src/features/planSelection/index.js | 2 | ||||
-rw-r--r-- | src/features/planSelection/store.js | 2 | ||||
-rw-r--r-- | src/features/trialStatusBar/index.js | 2 | ||||
-rw-r--r-- | src/features/trialStatusBar/store.js | 2 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 2 | ||||
-rw-r--r-- | src/i18n/messages/src/components/services/content/ConnectionLostBanner.json | 2 | ||||
-rw-r--r-- | src/index.js | 2 | ||||
-rw-r--r-- | src/models/Service.js | 2 | ||||
-rw-r--r-- | src/webview/lib/RecipeWebview.js | 2 | ||||
-rw-r--r-- | src/webview/spellchecker.js | 2 |
18 files changed, 23 insertions, 24 deletions
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js index 6dbdeaa7f..4dbfcd6d4 100644 --- a/src/api/utils/auth.js +++ b/src/api/utils/auth.js | |||
@@ -8,11 +8,11 @@ export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => | |||
8 | mode: 'cors', | 8 | mode: 'cors', |
9 | headers: Object.assign({ | 9 | headers: Object.assign({ |
10 | 'Content-Type': 'application/json', | 10 | 'Content-Type': 'application/json', |
11 | 'X-Franz-Source': 'desktop', | 11 | 'X-Ferdi-Source': 'desktop', |
12 | 'X-Franz-Version': app.getVersion(), | 12 | 'X-Ferdi-Version': app.getVersion(), |
13 | 'X-Franz-platform': process.platform, | 13 | 'X-Ferdi-platform': process.platform, |
14 | 'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(), | 14 | 'X-Ferdi-Timezone-Offset': new Date().getTimezoneOffset(), |
15 | 'X-Franz-System-Locale': app.getLocale(), | 15 | 'X-Ferdi-System-Locale': app.getLocale(), |
16 | }, options.headers), | 16 | }, options.headers), |
17 | }); | 17 | }); |
18 | 18 | ||
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js index 9609a65b1..36ab2b351 100644 --- a/src/components/services/content/ConnectionLostBanner.js +++ b/src/components/services/content/ConnectionLostBanner.js | |||
@@ -14,7 +14,7 @@ import { LIVE_API_WEBSITE } from '../../../config'; | |||
14 | const messages = defineMessages({ | 14 | const messages = defineMessages({ |
15 | text: { | 15 | text: { |
16 | id: 'connectionLostBanner.message', | 16 | id: 'connectionLostBanner.message', |
17 | defaultMessage: '!!!Oh no! Franz lost the connection to {name}.', | 17 | defaultMessage: '!!!Oh no! Ferdi lost the connection to {name}.', |
18 | }, | 18 | }, |
19 | moreInformation: { | 19 | moreInformation: { |
20 | id: 'connectionLostBanner.informationLink', | 20 | id: 'connectionLostBanner.informationLink', |
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 75611f77c..24bbe7939 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -12,7 +12,7 @@ import { observable, autorun } from 'mobx'; | |||
12 | import ServiceModel from '../../../models/Service'; | 12 | import ServiceModel from '../../../models/Service'; |
13 | import { ctrlKey, cmdKey } from '../../../environment'; | 13 | import { ctrlKey, cmdKey } from '../../../environment'; |
14 | 14 | ||
15 | const IS_SERVICE_DEBUGGING_ENABLED = (localStorage.getItem('debug') || '').includes('Franz:Service'); | 15 | const IS_SERVICE_DEBUGGING_ENABLED = (localStorage.getItem('debug') || '').includes('Ferdi:Service'); |
16 | 16 | ||
17 | const { Menu, dialog, app } = remote; | 17 | const { Menu, dialog, app } = remote; |
18 | 18 | ||
diff --git a/src/config.js b/src/config.js index 9117089c5..ecd1aa316 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -212,7 +212,7 @@ export const ALLOWED_PROTOCOLS = [ | |||
212 | 'https:', | 212 | 'https:', |
213 | 'http:', | 213 | 'http:', |
214 | 'ftp:', | 214 | 'ftp:', |
215 | 'franz:', | 215 | 'ferdi:', |
216 | ]; | 216 | ]; |
217 | 217 | ||
218 | export const PLANS = { | 218 | export const PLANS = { |
diff --git a/src/electron/ipc-api/cld.js b/src/electron/ipc-api/cld.js index 23f18aa94..73e320ad9 100644 --- a/src/electron/ipc-api/cld.js +++ b/src/electron/ipc-api/cld.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import { ipcMain } from 'electron'; | 1 | import { ipcMain } from 'electron'; |
2 | import cld from 'cld'; | 2 | import cld from 'cld'; |
3 | 3 | ||
4 | const debug = require('debug')('Franz:ipcApi:cld'); | 4 | const debug = require('debug')('Ferdi:ipcApi:cld'); |
5 | 5 | ||
6 | export default async () => { | 6 | export default async () => { |
7 | ipcMain.handle('detect-language', async (event, { sample }) => { | 7 | ipcMain.handle('detect-language', async (event, { sample }) => { |
diff --git a/src/electron/ipc-api/dnd.js b/src/electron/ipc-api/dnd.js index 4589aa222..da4d7781e 100644 --- a/src/electron/ipc-api/dnd.js +++ b/src/electron/ipc-api/dnd.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import { ipcMain } from 'electron'; | 1 | import { ipcMain } from 'electron'; |
2 | import { getDoNotDisturb } from '@meetfranz/electron-notification-state'; | 2 | import { getDoNotDisturb } from '@meetfranz/electron-notification-state'; |
3 | 3 | ||
4 | const debug = require('debug')('Franz:ipcApi:dnd'); | 4 | const debug = require('debug')('Ferdi:ipcApi:dnd'); |
5 | 5 | ||
6 | export default async () => { | 6 | export default async () => { |
7 | ipcMain.handle('get-dnd', async () => { | 7 | ipcMain.handle('get-dnd', async () => { |
diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js index 682a46a41..940b16c6e 100644 --- a/src/electron/macOSPermissions.js +++ b/src/electron/macOSPermissions.js | |||
@@ -10,7 +10,7 @@ if (isMac) { | |||
10 | askForScreenCaptureAccess = require('node-mac-permissions').askForScreenCaptureAccess; | 10 | askForScreenCaptureAccess = require('node-mac-permissions').askForScreenCaptureAccess; |
11 | } | 11 | } |
12 | 12 | ||
13 | const debug = require('debug')('Franz:macOSPermissions'); | 13 | const debug = require('debug')('Ferdi:macOSPermissions'); |
14 | 14 | ||
15 | const permissionExists = macosVersion.isGreaterThanOrEqualTo('10.15'); | 15 | const permissionExists = macosVersion.isGreaterThanOrEqualTo('10.15'); |
16 | const filePath = path.join(app.getPath('userData'), '.has-app-requested-screen-capture-permissions'); | 16 | const filePath = path.join(app.getPath('userData'), '.has-app-requested-screen-capture-permissions'); |
@@ -49,7 +49,6 @@ function createStatusFile() { | |||
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
52 | |||
53 | export default async function (mainWindow) { | 52 | export default async function (mainWindow) { |
54 | debug('Checking camera & microphone permissions'); | 53 | debug('Checking camera & microphone permissions'); |
55 | systemPreferences.askForMediaAccess('camera'); | 54 | systemPreferences.askForMediaAccess('camera'); |
@@ -61,7 +60,7 @@ export default async function (mainWindow) { | |||
61 | const { response } = await dialog.showMessageBox(mainWindow, { | 60 | const { response } = await dialog.showMessageBox(mainWindow, { |
62 | type: 'info', | 61 | type: 'info', |
63 | message: 'Enable Screen Sharing', | 62 | message: 'Enable Screen Sharing', |
64 | detail: 'To enable screen sharing for some services, Franz needs the permission to record your screen.', | 63 | detail: 'To enable screen sharing for some services, Ferdi needs the permission to record your screen.', |
65 | buttons: [ | 64 | buttons: [ |
66 | 'Allow screen sharing', | 65 | 'Allow screen sharing', |
67 | 'No', | 66 | 'No', |
diff --git a/src/features/planSelection/api.js b/src/features/planSelection/api.js index 734643f10..65e6c2e82 100644 --- a/src/features/planSelection/api.js +++ b/src/features/planSelection/api.js | |||
@@ -2,7 +2,7 @@ import { sendAuthRequest } from '../../api/utils/auth'; | |||
2 | import { API, API_VERSION } from '../../environment'; | 2 | import { API, API_VERSION } from '../../environment'; |
3 | import Request from '../../stores/lib/Request'; | 3 | import Request from '../../stores/lib/Request'; |
4 | 4 | ||
5 | const debug = require('debug')('Franz:feature:planSelection:api'); | 5 | const debug = require('debug')('Ferdi:feature:planSelection:api'); |
6 | 6 | ||
7 | export const planSelectionApi = { | 7 | export const planSelectionApi = { |
8 | downgrade: async () => { | 8 | downgrade: async () => { |
diff --git a/src/features/planSelection/index.js b/src/features/planSelection/index.js index 890be8871..b96ad6d8f 100644 --- a/src/features/planSelection/index.js +++ b/src/features/planSelection/index.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import { reaction } from 'mobx'; | 1 | import { reaction } from 'mobx'; |
2 | import PlanSelectionStore from './store'; | 2 | import PlanSelectionStore from './store'; |
3 | 3 | ||
4 | const debug = require('debug')('Franz:feature:planSelection'); | 4 | const debug = require('debug')('Ferdi:feature:planSelection'); |
5 | 5 | ||
6 | export const planSelectionStore = new PlanSelectionStore(); | 6 | export const planSelectionStore = new PlanSelectionStore(); |
7 | 7 | ||
diff --git a/src/features/planSelection/store.js b/src/features/planSelection/store.js index 448e323ff..de8fc7584 100644 --- a/src/features/planSelection/store.js +++ b/src/features/planSelection/store.js | |||
@@ -9,7 +9,7 @@ import { FeatureStore } from '../utils/FeatureStore'; | |||
9 | import { createActionBindings } from '../utils/ActionBinding'; | 9 | import { createActionBindings } from '../utils/ActionBinding'; |
10 | import { downgradeUserRequest } from './api'; | 10 | import { downgradeUserRequest } from './api'; |
11 | 11 | ||
12 | const debug = require('debug')('Franz:feature:planSelection:store'); | 12 | const debug = require('debug')('Ferdi:feature:planSelection:store'); |
13 | 13 | ||
14 | export default class PlanSelectionStore extends FeatureStore { | 14 | export default class PlanSelectionStore extends FeatureStore { |
15 | @observable isFeatureEnabled = false; | 15 | @observable isFeatureEnabled = false; |
diff --git a/src/features/trialStatusBar/index.js b/src/features/trialStatusBar/index.js index ec84cdfd7..987b5c04e 100644 --- a/src/features/trialStatusBar/index.js +++ b/src/features/trialStatusBar/index.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import { reaction } from 'mobx'; | 1 | import { reaction } from 'mobx'; |
2 | import TrialStatusBarStore from './store'; | 2 | import TrialStatusBarStore from './store'; |
3 | 3 | ||
4 | const debug = require('debug')('Franz:feature:trialStatusBar'); | 4 | const debug = require('debug')('Ferdi:feature:trialStatusBar'); |
5 | 5 | ||
6 | export const GA_CATEGORY_TRIAL_STATUS_BAR = 'trialStatusBar'; | 6 | export const GA_CATEGORY_TRIAL_STATUS_BAR = 'trialStatusBar'; |
7 | 7 | ||
diff --git a/src/features/trialStatusBar/store.js b/src/features/trialStatusBar/store.js index 89cf32392..858a08238 100644 --- a/src/features/trialStatusBar/store.js +++ b/src/features/trialStatusBar/store.js | |||
@@ -9,7 +9,7 @@ import { trialStatusBarActions } from './actions'; | |||
9 | import { FeatureStore } from '../utils/FeatureStore'; | 9 | import { FeatureStore } from '../utils/FeatureStore'; |
10 | import { createActionBindings } from '../utils/ActionBinding'; | 10 | import { createActionBindings } from '../utils/ActionBinding'; |
11 | 11 | ||
12 | const debug = require('debug')('Franz:feature:trialStatusBar:store'); | 12 | const debug = require('debug')('Ferdi:feature:trialStatusBar:store'); |
13 | 13 | ||
14 | export default class TrialStatusBarStore extends FeatureStore { | 14 | export default class TrialStatusBarStore extends FeatureStore { |
15 | @observable isFeatureActive = false; | 15 | @observable isFeatureActive = false; |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index cdad061ca..b93a49b47 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -1525,7 +1525,7 @@ | |||
1525 | { | 1525 | { |
1526 | "descriptors": [ | 1526 | "descriptors": [ |
1527 | { | 1527 | { |
1528 | "defaultMessage": "!!!Oh no! Franz lost the connection to {name}.", | 1528 | "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.", |
1529 | "end": { | 1529 | "end": { |
1530 | "column": 3, | 1530 | "column": 3, |
1531 | "line": 18 | 1531 | "line": 18 |
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json index fd7019f41..bcfb6ab94 100644 --- a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json +++ b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json | |||
@@ -1,7 +1,7 @@ | |||
1 | [ | 1 | [ |
2 | { | 2 | { |
3 | "id": "connectionLostBanner.message", | 3 | "id": "connectionLostBanner.message", |
4 | "defaultMessage": "!!!Oh no! Franz lost the connection to {name}.", | 4 | "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.", |
5 | "file": "src/components/services/content/ConnectionLostBanner.js", | 5 | "file": "src/components/services/content/ConnectionLostBanner.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 15, | 7 | "line": 15, |
diff --git a/src/index.js b/src/index.js index 840591ed5..396d2e649 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -360,7 +360,7 @@ const createWindow = () => { | |||
360 | // https://electronjs.org/docs/api/chrome-command-line-switches | 360 | // https://electronjs.org/docs/api/chrome-command-line-switches |
361 | // used for Kerberos support | 361 | // used for Kerberos support |
362 | // Usage e.g. MACOS | 362 | // Usage e.g. MACOS |
363 | // $ Franz.app/Contents/MacOS/Ferdi --auth-server-whitelist *.mydomain.com --auth-negotiate-delegate-whitelist *.mydomain.com | 363 | // $ Ferdi.app/Contents/MacOS/Ferdi --auth-server-whitelist *.mydomain.com --auth-negotiate-delegate-whitelist *.mydomain.com |
364 | const argv = require('minimist')(process.argv.slice(1)); | 364 | const argv = require('minimist')(process.argv.slice(1)); |
365 | 365 | ||
366 | if (argv['auth-server-whitelist']) { | 366 | if (argv['auth-server-whitelist']) { |
diff --git a/src/models/Service.js b/src/models/Service.js index ef1276619..a980ca4a3 100644 --- a/src/models/Service.js +++ b/src/models/Service.js | |||
@@ -6,7 +6,7 @@ import path from 'path'; | |||
6 | import userAgent from '../helpers/userAgent-helpers'; | 6 | import userAgent from '../helpers/userAgent-helpers'; |
7 | import { TODOS_RECIPE_ID, todosStore } from '../features/todos'; | 7 | import { TODOS_RECIPE_ID, todosStore } from '../features/todos'; |
8 | 8 | ||
9 | const debug = require('debug')('Franz:Service'); | 9 | const debug = require('debug')('Ferdi:Service'); |
10 | 10 | ||
11 | export const RESTRICTION_TYPES = { | 11 | export const RESTRICTION_TYPES = { |
12 | SERVICE_LIMIT: 0, | 12 | SERVICE_LIMIT: 0, |
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js index add5fffa6..a9a3a1f51 100644 --- a/src/webview/lib/RecipeWebview.js +++ b/src/webview/lib/RecipeWebview.js | |||
@@ -1,7 +1,7 @@ | |||
1 | const { ipcRenderer } = require('electron'); | 1 | const { ipcRenderer } = require('electron'); |
2 | const fs = require('fs-extra'); | 2 | const fs = require('fs-extra'); |
3 | 3 | ||
4 | const debug = require('debug')('Franz:Plugin:RecipeWebview'); | 4 | const debug = require('debug')('Ferdi:Plugin:RecipeWebview'); |
5 | 5 | ||
6 | class RecipeWebview { | 6 | class RecipeWebview { |
7 | constructor() { | 7 | constructor() { |
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js index e7ef102e9..d7c917326 100644 --- a/src/webview/spellchecker.js +++ b/src/webview/spellchecker.js | |||
@@ -4,7 +4,7 @@ import { | |||
4 | import { SPELLCHECKER_LOCALES } from '../i18n/languages'; | 4 | import { SPELLCHECKER_LOCALES } from '../i18n/languages'; |
5 | import { isMac } from '../environment'; | 5 | import { isMac } from '../environment'; |
6 | 6 | ||
7 | const debug = require('debug')('Franz:spellchecker'); | 7 | const debug = require('debug')('Ferdi:spellchecker'); |
8 | 8 | ||
9 | const webContents = remote.getCurrentWebContents(); | 9 | const webContents = remote.getCurrentWebContents(); |
10 | const [defaultLocale] = webContents.session.getSpellCheckerLanguages(); | 10 | const [defaultLocale] = webContents.session.getSpellCheckerLanguages(); |