Merge branch 'release-1.4' into spellchecking

Merge branch 'release-1.3' into dev
Merge branch 'release-1.3' of github.com:laurent22/joplin into release-1.3
2026-04-21 19:45:16 +02:00 · 2020-10-31 23:50:08 +00:00 · 2020-10-31 16:49:50 +00:00 · 2020-10-31 16:45:17 +00:00 · 2020-10-31 12:38:54 -04:00 · 2020-10-31 16:29:17 +00:00
310 changed files with 105615 additions and 100665 deletions
@@ -105,7 +105,11 @@ ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
 ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/openFolder.js
+ElectronClient/gui/MainScreen/commands/openNote.js
+ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js
@@ -122,6 +126,7 @@ ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
+ElectronClient/gui/menuCommandNames.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -144,8 +149,10 @@ ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
 ElectronClient/gui/NoteEditor/NoteEditor.js
+ElectronClient/gui/NoteEditor/NoteTitle/NoteTitleBar.js
 ElectronClient/gui/NoteEditor/styles/index.js
 ElectronClient/gui/NoteEditor/utils/contextMenu.js
 ElectronClient/gui/NoteEditor/utils/index.js
@@ -202,6 +209,7 @@ ElectronClient/services/plugins/PluginRunner.js
 ElectronClient/services/plugins/UserWebview.js
 ElectronClient/services/plugins/UserWebviewDialog.js
 ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
+ElectronClient/services/spellChecker/SpellCheckerServiceDriverNative.js
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/BaseApplication.js
 ReactNativeClient/lib/checkPermissions.js
@@ -325,6 +333,8 @@ ReactNativeClient/lib/services/rest/errors.js
 ReactNativeClient/lib/services/searchengine/filterParser.js
 ReactNativeClient/lib/services/searchengine/queryBuilder.js
 ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerService.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerServiceDriverBase.js
 ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
 ReactNativeClient/lib/services/synchronizer/LockHandler.js
 ReactNativeClient/lib/services/synchronizer/MigrationHandler.js
@@ -347,6 +357,7 @@ ReactNativeClient/lib/themes/oledDark.js
 ReactNativeClient/lib/themes/solarizedDark.js
 ReactNativeClient/lib/themes/solarizedLight.js
 ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/time.js
 ReactNativeClient/lib/uuid.js
 ReactNativeClient/lib/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js
@@ -99,7 +99,11 @@ ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
 ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/openFolder.js
+ElectronClient/gui/MainScreen/commands/openNote.js
+ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js
@@ -116,6 +120,7 @@ ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
+ElectronClient/gui/menuCommandNames.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -138,8 +143,10 @@ ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
 ElectronClient/gui/NoteEditor/NoteEditor.js
+ElectronClient/gui/NoteEditor/NoteTitle/NoteTitleBar.js
 ElectronClient/gui/NoteEditor/styles/index.js
 ElectronClient/gui/NoteEditor/utils/contextMenu.js
 ElectronClient/gui/NoteEditor/utils/index.js
@@ -196,6 +203,7 @@ ElectronClient/services/plugins/PluginRunner.js
 ElectronClient/services/plugins/UserWebview.js
 ElectronClient/services/plugins/UserWebviewDialog.js
 ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
+ElectronClient/services/spellChecker/SpellCheckerServiceDriverNative.js
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/BaseApplication.js
 ReactNativeClient/lib/checkPermissions.js
@@ -319,6 +327,8 @@ ReactNativeClient/lib/services/rest/errors.js
 ReactNativeClient/lib/services/searchengine/filterParser.js
 ReactNativeClient/lib/services/searchengine/queryBuilder.js
 ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerService.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerServiceDriverBase.js
 ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
 ReactNativeClient/lib/services/synchronizer/LockHandler.js
 ReactNativeClient/lib/services/synchronizer/MigrationHandler.js
@@ -341,6 +351,7 @@ ReactNativeClient/lib/themes/oledDark.js
 ReactNativeClient/lib/themes/solarizedDark.js
 ReactNativeClient/lib/themes/solarizedLight.js
 ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/time.js
 ReactNativeClient/lib/uuid.js
 ReactNativeClient/lib/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js
@@ -48,7 +48,11 @@ ElectronClient/gui/MainScreen/commands/hideModalMessage.js
 ElectronClient/gui/MainScreen/commands/moveToFolder.js
 ElectronClient/gui/MainScreen/commands/newFolder.js
 ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newSubFolder.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/openFolder.js
+ElectronClient/gui/MainScreen/commands/openNote.js
+ElectronClient/gui/MainScreen/commands/openTag.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
 ElectronClient/gui/MainScreen/commands/renameTag.js
@@ -65,6 +69,7 @@ ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
+ElectronClient/gui/menuCommandNames.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -87,8 +92,10 @@ ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.js
 ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
 ElectronClient/gui/NoteEditor/NoteEditor.js
+ElectronClient/gui/NoteEditor/NoteTitle/NoteTitleBar.js
 ElectronClient/gui/NoteEditor/styles/index.js
 ElectronClient/gui/NoteEditor/utils/contextMenu.js
 ElectronClient/gui/NoteEditor/utils/index.js
@@ -145,6 +152,7 @@ ElectronClient/services/plugins/PluginRunner.js
 ElectronClient/services/plugins/UserWebview.js
 ElectronClient/services/plugins/UserWebviewDialog.js
 ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
+ElectronClient/services/spellChecker/SpellCheckerServiceDriverNative.js
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/BaseApplication.js
 ReactNativeClient/lib/checkPermissions.js
@@ -268,6 +276,8 @@ ReactNativeClient/lib/services/rest/errors.js
 ReactNativeClient/lib/services/searchengine/filterParser.js
 ReactNativeClient/lib/services/searchengine/queryBuilder.js
 ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerService.js
+ReactNativeClient/lib/services/spellChecker/SpellCheckerServiceDriverBase.js
 ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
 ReactNativeClient/lib/services/synchronizer/LockHandler.js
 ReactNativeClient/lib/services/synchronizer/MigrationHandler.js
@@ -290,6 +300,7 @@ ReactNativeClient/lib/themes/oledDark.js
 ReactNativeClient/lib/themes/solarizedDark.js
 ReactNativeClient/lib/themes/solarizedLight.js
 ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/time.js
 ReactNativeClient/lib/uuid.js
 ReactNativeClient/lib/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js
@@ -1,6 +1,6 @@
 const yargParser = require('yargs-parser');
 const { _ } = require('lib/locale');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const stringPadding = require('string-padding');
 const Logger = require('lib/Logger').default;

@@ -3,7 +3,7 @@ const { app } = require('./app.js');
 const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;

 class Command extends BaseCommand {
 	usage() {
@@ -45,10 +45,12 @@ class Command extends BaseCommand {

 		const startDecryption = async () => {
 			this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
-
 			while (true) {
 				try {
 					const result = await DecryptionWorker.instance().start();
+
+					if (result.error) throw result.error;
+
 					const line = [];
 					line.push(_('Decrypted items: %d', result.decryptedItemCount));
 					if (result.skippedItemCount) line.push(_('Skipped items: %d (use --retry-failed-items to retry decrypting them)', result.skippedItemCount));
@@ -6,7 +6,7 @@ const Folder = require('lib/models/Folder.js');
 const Setting = require('lib/models/Setting').default;
 const Note = require('lib/models/Note.js');
 const { sprintf } = require('sprintf-js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const { cliUtils } = require('./cli-utils.js');

 class Command extends BaseCommand {
@@ -3,7 +3,7 @@ const { app } = require('./app.js');
 const { _ } = require('lib/locale');
 const Tag = require('lib/models/Tag.js');
 const BaseModel = require('lib/BaseModel.js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;

 class Command extends BaseCommand {
 	usage() {
@@ -3,7 +3,7 @@ const { app } = require('./app.js');
 const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
 const Note = require('lib/models/Note.js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;

 class Command extends BaseCommand {
 	usage() {
@@ -1,6 +1,6 @@
 'use strict';

-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const Logger = require('lib/Logger').default;
 const Resource = require('lib/models/Resource.js');
 const { dirname } = require('lib/path-utils');
@@ -38,33 +38,33 @@ locales['tr_TR'] = require('./tr_TR.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":79};
+stats['ar'] = {"percentDone":78};
 stats['eu'] = {"percentDone":33};
 stats['bs_BA'] = {"percentDone":82};
 stats['bg_BG'] = {"percentDone":65};
 stats['ca'] = {"percentDone":95};
 stats['hr_HR'] = {"percentDone":27};
-stats['cs_CZ'] = {"percentDone":99};
-stats['da_DK'] = {"percentDone":73};
+stats['cs_CZ'] = {"percentDone":98};
+stats['da_DK'] = {"percentDone":72};
 stats['de_DE'] = {"percentDone":97};
 stats['et_EE'] = {"percentDone":65};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":99};
+stats['es_ES'] = {"percentDone":98};
 stats['eo'] = {"percentDone":37};
 stats['fr_FR'] = {"percentDone":98};
 stats['gl_ES'] = {"percentDone":42};
 stats['id_ID'] = {"percentDone":92};
 stats['it_IT'] = {"percentDone":98};
-stats['nl_BE'] = {"percentDone":33};
 stats['nl_NL'] = {"percentDone":94};
+stats['nl_BE'] = {"percentDone":33};
 stats['nb_NO'] = {"percentDone":87};
 stats['fa'] = {"percentDone":82};
 stats['pl_PL'] = {"percentDone":97};
 stats['pt_PT'] = {"percentDone":98};
-stats['pt_BR'] = {"percentDone":95};
+stats['pt_BR'] = {"percentDone":96};
 stats['ro'] = {"percentDone":77};
-stats['sl_SI'] = {"percentDone":42};
+stats['sl_SI'] = {"percentDone":41};
 stats['sv'] = {"percentDone":70};
 stats['th_TH'] = {"percentDone":52};
 stats['vi'] = {"percentDone":84};
@@ -74,6 +74,6 @@ stats['ru_RU'] = {"percentDone":94};
 stats['sr_RS'] = {"percentDone":70};
 stats['zh_CN'] = {"percentDone":95};
 stats['zh_TW'] = {"percentDone":94};
-stats['ja_JP'] = {"percentDone":97};
+stats['ja_JP'] = {"percentDone":99};
 stats['ko'] = {"percentDone":99};
 module.exports = { locales: locales, stats: stats };
@@ -23,9 +23,9 @@
      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="
    },
    "abab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
    },
    "abbrev": {
      "version": "1.1.1",
@@ -33,9 +33,9 @@
      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
    },
    "acorn": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-      "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
    },
    "acorn-globals": {
      "version": "4.3.4",
@@ -47,9 +47,9 @@
      },
      "dependencies": {
        "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
+          "version": "6.4.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
        }
      }
    },
@@ -2964,9 +2964,9 @@
      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
    },
    "highlight.js": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz",
-      "integrity": "sha512-b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.1.tgz",
+      "integrity": "sha512-A+sckVPIb9zQTUydC9lpRX1qRFO/N0OKEh0NwIr65ckvWA/oMY8v9P3+kGRK3w2ULSh9E8v5MszXafodQ6039g=="
    },
    "homedir-polyfill": {
      "version": "1.0.3",
@@ -3655,9 +3655,9 @@
      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
    },
    "joplin-turndown": {
-      "version": "4.0.29",
-      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.29.tgz",
-      "integrity": "sha512-rVGu8u4TpSRETo59/jiVW9iaXnpdxxpBHjb7nyCflkDfWhg1Kska4uagBQGw7cD2yxw7mB2YUIB/fAgtlIzcDQ==",
+      "version": "4.0.30",
+      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.30.tgz",
+      "integrity": "sha512-OrGdNTsjI6/cbx/es9Hl0YI3YTql4SopduFcYCnWTZgqT0SJqILnF2JQxSNnbPnkSDIIRdNOG4+iNzlY6bS1nw==",
      "requires": {
        "css": "^2.2.4",
        "html-entities": "^1.2.1",
@@ -5573,13 +5573,6 @@
      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
      "requires": {
        "lodash": "^4.17.19"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
-        }
      }
    },
    "request-promise-native": {
@@ -52,14 +52,14 @@
    "font-awesome-filetypes": "^2.1.0",
    "form-data": "^2.1.4",
    "fs-extra": "^5.0.0",
-    "highlight.js": "10.1.1",
+    "highlight.js": "^10.2.1",
    "html-entities": "^1.2.1",
    "html-minifier": "^3.5.15",
    "htmlparser2": "^4.1.0",
    "image-data-uri": "^2.0.0",
    "image-type": "^3.0.0",
    "immer": "^7.0.14",
-    "joplin-turndown": "^4.0.29",
+    "joplin-turndown": "^4.0.30",
    "joplin-turndown-plugin-gfm": "^1.0.12",
    "json-stringify-safe": "^5.0.1",
    "jssha": "^2.3.0",
@@ -2,7 +2,7 @@

 require('app-module-path').addPath(__dirname);

-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const ArrayUtils = require('lib/ArrayUtils.js');

@@ -3,7 +3,7 @@
 require('app-module-path').addPath(__dirname);

 const os = require('os');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const { filename } = require('lib/path-utils');
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const Folder = require('lib/models/Folder.js');
@@ -3,7 +3,7 @@
 require('app-module-path').addPath(__dirname);

 const os = require('os');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const { filename } = require('lib/path-utils');
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const Folder = require('lib/models/Folder.js');
@@ -3,7 +3,7 @@
 require('app-module-path').addPath(__dirname);

 const os = require('os');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const { filename } = require('lib/path-utils');
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const Folder = require('lib/models/Folder.js');
@@ -1,5 +1,5 @@
 import InMemoryCache from 'lib/InMemoryCache';
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;

 describe('InMemoryCache', function() {

@@ -2,7 +2,7 @@

 require('app-module-path').addPath(__dirname);

-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const { sortedIds, createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
@@ -1,5 +1,5 @@
 <en-note>
-  <div><a href="joplin://21ca2b948f222a38802940ec7e2e5de3" hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1">attachment-1</a></div>
+  <div><a href=":/21ca2b948f222a38802940ec7e2e5de3" hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1">attachment-1</a></div>
  <div>
    <br>
  </div>
@@ -5,7 +5,7 @@ const Setting = require('lib/models/Setting').default;
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;

 let testApp = null;

@@ -5,7 +5,7 @@ const Setting = require('lib/models/Setting').default;
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const { ALL_NOTES_FILTER_ID } = require('lib/reserved-ids.js');

 //
@@ -5,7 +5,7 @@ const Setting = require('lib/models/Setting').default;
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;

 let testApp = null;

@@ -3,7 +3,7 @@
 require('app-module-path').addPath(__dirname);

 const uuid = require('lib/uuid').default;
-const { time } = require('lib/time-utils.js');
+const time = require('lib/time').default;
 const { asyncTest, sleep, fileApi, fileContentEqual, checkThrowAsync } = require('test-utils.js');
 const shim = require('lib/shim').default;
 const fs = require('fs-extra');
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Cozic	2bfbeb002d	Merge branch 'release-1.4' into spellchecking	2020-10-31 23:50:08 +00:00
Laurent Cozic	6d2bad01e6	Merge branch 'release-1.3' into dev	2020-10-31 16:49:50 +00:00
Laurent Cozic	3847831d80	Merge branch 'release-1.3' of github.com:laurent22/joplin into release-1.3	2020-10-31 16:45:17 +00:00
Robin	44462f4d71	All: Translation: Update nl_NL.po (#4012 )	2020-10-31 12:38:54 -04:00
Laurent Cozic	4d20589773	Desktop: Remove from keymap editor commands that cannot be associated with a shortcut	2020-10-31 16:29:17 +00:00
Laurent Cozic	52140ec1a9	Merge branch 'release-1.3' into dev	2020-10-31 13:06:06 +00:00
Laurent Cozic	08c2a7ad64	Tools: Improved HTML escape in git-changelog	2020-10-31 13:05:46 +00:00
Laurent Cozic	d19796f14c	Electron release v1.3.11	2020-10-31 13:02:14 +00:00
Laurent Cozic	e4f53a48d2	Desktop: Fixed handling of Option key for shortcuts in macOS	2020-10-31 13:01:40 +00:00
Laurent Cozic	154163bd6c	Desktop: Fixes #4010 : Add history backward and forward commands to keymap and menus	2020-10-31 12:46:55 +00:00
Laurent Cozic	4502414934	Desktop: Make sure all commands appear in keymap editor	2020-10-31 12:25:12 +00:00
Laurent Cozic	86c471afcd	Cli: Fixes #4000 : Display proper error message when decryption worker cannot be started	2020-10-29 23:37:19 +00:00
Laurent Cozic	d0c8693c26	Added answser to question that will surely come	2020-10-29 18:38:42 +00:00
Laurent Cozic	8a461a66e6	Merge branch 'dev' into spellchecking	2020-10-29 17:29:18 +00:00
Laurent Cozic	e2698aaead	Merge branch 'release-1.3' into dev	2020-10-29 17:10:48 +00:00
Laurent Cozic	8cfe4b0f82	Mobile: Disable beta editor for now due to bugs that cannot be fixed and crashes. See https://discourse.joplinapp.org/t/11658/9?u=laurent	2020-10-29 16:42:47 +00:00
Laurent Cozic	fd90a490c0	All: Security: Remove "link" and "meta" tags from notes to prevent XSS	2020-10-29 16:19:56 +00:00
Helmut K. C. Tessarek	16c5ffadc7	Update translations	2020-10-29 10:34:31 -04:00
Laurent Cozic	4a184721e4	Doc: Restored privacy policy document	2020-10-29 13:49:12 +00:00
Laurent Cozic	1e3bd937ed	Android release v1.3.10	2020-10-29 11:34:10 +00:00
Laurent Cozic	0f6932f1e8	Clipper release v1.3.1	2020-10-29 11:28:21 +00:00
Laurent Cozic	cab98776db	Electron release v1.3.10	2020-10-29 11:20:45 +00:00
Laurent Cozic	fbc1e3ed3b	Merge branch 'dev' into release-1.3	2020-10-29 11:18:32 +00:00
Ji-Hyeon Gim	805d16abda	All: Translation: Update ko.po (#3995 ) It updates fuzzy translations for Korean. Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>	2020-10-29 11:18:01 +00:00
Eduardo Braga	f133229287	Add some missing translations to pt_BR.po (#3994 )	2020-10-29 11:16:18 +00:00
Mario Campo	8f4031572a	Update es_ES.po (#3978 ) Several corrections in spanish language	2020-10-29 11:15:53 +00:00
Laurent Cozic	d25fa796c0	Api: Added service to access resource external editing	2020-10-29 11:09:18 +00:00
Laurent Cozic	089d6a5c9e	All: Fixes #3993 : Fix slow Katex rendering when there are many global definitions	2020-10-29 10:44:48 +00:00
Laurent Cozic	3f83355d9f	Clipper: Fixes #3984 : Images from some website were not being downloaded	2020-10-29 10:16:31 +00:00
Laurent Cozic	40380e3066	Merge branch 'release-1.3' of github.com:laurent22/joplin into release-1.3	2020-10-29 10:15:08 +00:00
Laurent Cozic	a6748bafb3	All: Fixes #3992 : Update highlight.js to fix freeze for certain code blocks	2020-10-28 17:31:54 +00:00
Laurent Cozic	b52f6eb77c	All: Fixes #3955 : Fixed sync issue when importing ENEX files that contain new line characters in the source URL attribute	2020-10-28 17:21:41 +00:00
Laurent Cozic	98c933fdb7	All: Fixed OneDrive authentication	2020-10-28 15:50:34 +00:00
Laurent Cozic	ece7ffadd6	Desktop: Fixes #3986 : Handle gzipped CSS files when importing from clipper	2020-10-28 15:47:36 +00:00
Laurent Cozic	591bceb8ef	Update mermaid	2020-10-28 12:10:35 +00:00
Laurent Cozic	04cfd07176	macOS: Regression: Restore Edit menu in config screens so that Copy/Cut/Paste shortcuts work	2020-10-28 11:23:57 +00:00
Laurent Cozic	db2282a351	Desktop: Fix syntax of imported resources when importing ENEX as HTML	2020-10-28 11:11:04 +00:00
Laurent Cozic	0ec3d6ca9d	Clipper: Upgraded clipper to support API pagination This version of the clipper will support both new and old Joplin clients, so as to ease the transition.	2020-10-27 00:38:39 +00:00
Laurent Cozic	8e783b78fe	Merge branch 'dev' into spellchecking	2020-10-26 23:21:17 +00:00
Laurent Cozic	442b7ce0d3	litner	2020-10-26 23:19:52 +00:00
Laurent Cozic	6a068a90b2	Desktop: Regression: Keyboard shortcut would not save in some cases	2020-10-25 17:46:41 +00:00
Laurent Cozic	9a6f6c8b39	Desktop: Regression: Restore "New sub-notebook" command	2020-10-25 17:29:52 +00:00
Laurent Cozic	52d5c32950	Plugins: Add the openNote, openFolder and openTag commands	2020-10-25 17:22:59 +00:00
Laurent Cozic	de47cff86d	Fixed case	2020-10-24 12:07:48 +01:00
Laurent Cozic	a459174f98	Desktop: Fix: Command Palette click did not work	2020-10-24 11:46:02 +01:00
Laurent Cozic	9077bb13d5	Merge branch 'dev' into spellchecking	2020-10-24 00:15:09 +01:00
Laurent Cozic	75d5aa3a77	Tools: Fixed linter errors	2020-10-24 00:14:30 +01:00
Laurent Cozic	d45f7ae523	Fixed context menu logic when CodeMirror is open	2020-10-23 17:27:18 +01:00
Laurent Cozic	5dd619a766	Merge branch 'release-1.3' into spellchecking	2020-10-23 17:12:07 +01:00
Laurent Cozic	0c8708a363	Clean up	2020-10-23 13:09:15 +01:00
Laurent Cozic	28c1676ed9	Allow enabling-disabling spell checking	2020-10-23 13:04:07 +01:00
Laurent Cozic	421ef885cd	Added support for title input field	2020-10-23 12:02:46 +01:00
Laurent Cozic	3582aeaec8	Fixed path resolve in Windows	2020-10-23 11:29:47 +01:00
Laurent Cozic	d07b2d4469	Moved title bar to separate component and converted time-utils to TypeScript	2020-10-23 11:06:47 +01:00
Laurent Cozic	e50e548e25	Support for custom dic	2020-10-23 10:07:14 +01:00
Laurent Cozic	84a87c10f7	Integration	2020-10-22 22:16:31 +01:00
Laurent Cozic	559e88e35d	Move context menu setup to separate file	2020-10-22 18:01:55 +01:00
Laurent Cozic	da8469a81b	Use native context menu in TinyMCE so that dictionary suggestions can be accessed	2020-10-22 17:53:31 +01:00