aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2020-02-11 14:10:40 +0100
committerLibravatar vantezzen <hello@vantezzen.io>2020-02-11 14:10:40 +0100
commit616811ae26eade9556d4de066d266591cd3bcf63 (patch)
treecacc08f3b823f6df2ac14e9cf94c19a124141209
parentMerge branch 'develop' of https://github.com/getferdi/ferdi into develop (diff)
downloadferdium-app-616811ae26eade9556d4de066d266591cd3bcf63.tar.gz
ferdium-app-616811ae26eade9556d4de066d266591cd3bcf63.tar.zst
ferdium-app-616811ae26eade9556d4de066d266591cd3bcf63.zip
Fix lint
m---------recipes0
-rw-r--r--src/features/todos/preload.js4
m---------src/internal-server0
3 files changed, 2 insertions, 2 deletions
diff --git a/recipes b/recipes
Subproject 1e6e6aff48be8fa2470c383d1c459c3bf852b83 Subproject f47c638a38baad7a978baf8e204743227f4005e
diff --git a/src/features/todos/preload.js b/src/features/todos/preload.js
index 0a1183030..d834cf547 100644
--- a/src/features/todos/preload.js
+++ b/src/features/todos/preload.js
@@ -22,10 +22,10 @@ ipcRenderer.on(IPC.TODOS_HOST_CHANNEL, (event, message) => {
22 hostMessageListener(message); 22 hostMessageListener(message);
23}); 23});
24 24
25if (location.href === 'https://app.franztodos.com/login/') { 25if (window.location.href === 'https://app.franztodos.com/login/') {
26 // Insert info element informing about Franz accounts 26 // Insert info element informing about Franz accounts
27 const infoElement = document.createElement('p'); 27 const infoElement = document.createElement('p');
28 infoElement.innerText = `You are using Franz\'s official Todo Service. 28 infoElement.innerText = `You are using Franz's official Todo Service.
29This service will only work with accounts registered with Franz - no Ferdi accounts will work here! 29This service will only work with accounts registered with Franz - no Ferdi accounts will work here!
30If you do not have a Franz account you can change the Todo service by going into Ferdi's settings and changing the "Todo server". 30If you do not have a Franz account you can change the Todo service by going into Ferdi's settings and changing the "Todo server".
31You can choose any service as this Todo server, e.g. Todoist or Apple Notes.`; 31You can choose any service as this Todo server, e.g. Todoist or Apple Notes.`;
diff --git a/src/internal-server b/src/internal-server
Subproject 65d1468901b7394c95e510c5aed1a23c22f0f71 Subproject 24c8ea3aad5b828297686a032103d2cc4eabc37