Added openProfileDirectory directory command and menu item

CliClient/.gitignore

@@ -22,5 +22,4 @@ yarn-error.log
 tests/support/dropbox-auth.txt
 tests/support/nextcloud-auth.json
 tests/support/onedrive-auth.txt
-build/
-patches/
+build/

CliClient/app/services/plugins/PluginRunner.ts

@@ -54,25 +54,15 @@ export default class PluginRunner extends BasePluginRunner {
 		};
 	}
 
-	async run(plugin:Plugin, sandbox:Global):Promise<void> {
-		return new Promise((resolve:Function, reject:Function) => {
-			const onStarted = () => {
-				plugin.off('started', onStarted);
-				resolve();
-			};
+	async run(plugin:Plugin, sandbox:Global) {
+		const vmSandbox = vm.createContext(this.newSandboxProxy(plugin.id, sandbox));
 
-			plugin.on('started', onStarted);
-
-			const vmSandbox = vm.createContext(this.newSandboxProxy(plugin.id, sandbox));
-
-			try {
-				vm.runInContext(plugin.scriptText, vmSandbox);
-			} catch (error) {
-				reject(error);
-				// this.logger().error(`In plugin ${plugin.id}:`, error);
-				// return;
-			}
-		});
+		try {
+			vm.runInContext(plugin.scriptText, vmSandbox);
+		} catch (error) {
+			this.logger().error(`In plugin ${plugin.id}:`, error);
+			return;
+		}
 	}
 
 }

CliClient/gulpfile.js

@@ -17,23 +17,12 @@ tasks.prepareBuild = {
 			excluded: ['node_modules'],
 		});
 		await utils.copyDir(`${__dirname}/locales-build`, `${buildDir}/locales`);
+		await utils.copyDir(`${__dirname}/../patches`, `${buildDir}/patches`);
 		await tasks.copyLib.fn();
 		await utils.copyFile(`${__dirname}/package.json`, `${buildDir}/package.json`);
 		await utils.copyFile(`${__dirname}/package-lock.json`, `${buildDir}/package-lock.json`);
 		await utils.copyFile(`${__dirname}/gulpfile.js`, `${buildDir}/gulpfile.js`);
 
-		// Import all the patches inside the CliClient directory
-		// and build file. Needs to be in CliClient dir for when running
-		// in dev mode, and in build dir for production.
-		const localPatchDir = `${buildDir}/patches`;
-		await fs.remove(localPatchDir);
-		await fs.mkdirp(localPatchDir);
-		await utils.copyDir(`${__dirname}/../patches/shared`, `${localPatchDir}`, { delete: false });
-		await utils.copyDir(`${__dirname}/../patches/node`, `${localPatchDir}`, { delete: false });
-
-		await fs.remove(`${__dirname}/patches`);
-		await utils.copyDir(`${localPatchDir}`, `${__dirname}/patches`);
-
 		const packageRaw = await fs.readFile(`${buildDir}/package.json`);
 		const package = JSON.parse(packageRaw.toString());
 		package.scripts.postinstall = 'patch-package';

CliClient/locales/ja_JP.po

@@ -15,8 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 
 #: ElectronClient/services/plugins/UserWebviewDialogButtonBar.js:20
 #: ElectronClient/checkForUpdates.js:139
@@ -124,6 +122,7 @@ msgid "Could not export notes: %s"
 msgstr "ノートをエクスポートできませんでした: %s"
 
 #: ElectronClient/plugins/GotoAnything.js:431
+#, fuzzy
 msgid ""
 "Type a note title or part of its content to jump to it. Or type # followed "
 "by a tag name, or @ followed by a notebook name. Or type : to search for "
@@ -131,7 +130,7 @@ msgid ""
 msgstr ""
 "題名や本文の一部を入力してノートを検索し、そのノートに移動できます。また、「#"
 "タグ名」で該当タグ付きノートの一覧に、「@ノートブック名」で該当ノートブックに"
-"移動できます。あるいは「:」でコマンドを検索して実行できます。"
+"移動できます。"
 
 #: ElectronClient/plugins/GotoAnything.js:456
 #: ElectronClient/plugins/GotoAnything.min.js:499
@@ -141,8 +140,9 @@ msgstr "Goto Anything..."
 
 #: ElectronClient/plugins/GotoAnything.js:463
 #: ElectronClient/gui/KeymapConfig/utils/getLabel.js:28
+#, fuzzy
 msgid "Command palette"
-msgstr "コマンドパレット"
+msgstr "コマンド"
 
 #: ElectronClient/plugins/GotoAnything.min.js:459
 msgid ""
@@ -818,8 +818,9 @@ msgid "New note"
 msgstr "新しいノート"
 
 #: ElectronClient/gui/MainScreen/commands/toggleEditors.js:18
+#, fuzzy
 msgid "Toggle editors"
-msgstr "エディターの切り替え"
+msgstr "エディターレイアウトの表示切り替え"
 
 #: ElectronClient/gui/MainScreen/commands/selectTemplate.js:24
 msgid "Template file:"
@@ -1413,9 +1414,9 @@ msgstr ""
 
 #: ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js:63
 #: ReactNativeClient/lib/services/KeymapService.js:144
-#, javascript-format
+#, fuzzy, javascript-format
 msgid "Error: %s"
-msgstr "エラー: %s"
+msgstr "エラー"
 
 #: ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js:126
 msgid "Command"
@@ -1485,8 +1486,9 @@ msgid "Open %s"
 msgstr "%s を開く"
 
 #: ElectronClient/commands/copyDevCommand.js:18
+#, fuzzy
 msgid "Copy dev mode command to clipboard"
-msgstr "開発モードコマンドをクリップボードにコピー"
+msgstr "クリップボードにパスを保存"
 
 #: ElectronClient/commands/startExternalEditing.js:20
 msgid "Edit in external editor"
@@ -1498,13 +1500,13 @@ msgid "Error opening note in editor: %s"
 msgstr "次のエディターで開く際にエラー: %s"
 
 #: ElectronClient/commands/toggleExternalEditing.js:18
+#, fuzzy
 msgid "Toggle external editing"
-msgstr "外部エディターでの編集を開始・終了"
+msgstr "外部エディターでの編集を終了"
 
-# Intentionally chose the word "Finish" instead of "Stop". Hope this string won't be used in more generic contexts.
 #: ElectronClient/commands/toggleExternalEditing.js:37
 msgid "Stop"
-msgstr "終了"
+msgstr ""
 
 #: ElectronClient/commands/stopExternalEditing.js:18
 msgid "Stop external editing"
@@ -2227,7 +2229,7 @@ msgid "Cannot load \"%s\" module for format \"%s\" and output \"%s\""
 msgstr "\"%s\" モジュール （\"%s / %s\" フォーマット用） を読み込めません"
 
 #: ReactNativeClient/lib/services/interop/InteropService.js:152
-#, javascript-format
+#, fuzzy, javascript-format
 msgid "Cannot load \"%s\" module for format \"%s\" and target \"%s\""
 msgstr "\"%s\" モジュール （\"%s / %s\" フォーマット用） を読み込めません"
 
@@ -2245,24 +2247,26 @@ msgid "Restored Notes"
 msgstr "復元されたノート"
 
 #: ReactNativeClient/lib/services/KeymapService.js:240
+#, fuzzy
 msgid "command"
 msgstr "コマンド"
 
 #: ReactNativeClient/lib/services/KeymapService.js:240
 #: ReactNativeClient/lib/services/KeymapService.js:245
-#, javascript-format
+#, fuzzy, javascript-format
 msgid "\"%s\" is missing the required \"%s\" property."
-msgstr "\"%s\" は必須の \"%s\" プロパティを持っていません。"
+msgstr ""
+"キーマップアイテム %s は必須の \"command\" プロパティを持っていません。"
 
 #: ReactNativeClient/lib/services/KeymapService.js:245
 #: ReactNativeClient/lib/services/KeymapService.js:252
 msgid "accelerator"
-msgstr "ショートカットキー"
+msgstr ""
 
 #: ReactNativeClient/lib/services/KeymapService.js:252
-#, javascript-format
+#, fuzzy, javascript-format
 msgid "Invalid %s: %s."
-msgstr "無効な %s: %s"
+msgstr "無効な入力：%s"
 
 #: ReactNativeClient/lib/services/KeymapService.js:270
 #, javascript-format
@@ -2729,13 +2733,11 @@ msgid ""
 "\n"
 "You may turn off this option at any time in the Configuration screen."
 msgstr ""
-"ノートに位置情報を保存するには、ユーザーの許可が必要です。\n"
-"\n"
-"位置情報を保存するかどうかは、設定画面でいつでも変更できます。"
 
 #: ReactNativeClient/lib/components/screens/Note.js:341
+#, fuzzy
 msgid "Permission needed"
-msgstr "許可が必要"
+msgstr "カメラ使用の許可"
 
 #: ReactNativeClient/lib/components/screens/Note.js:501
 #: ReactNativeClient/lib/shim-init-node.js:91
@@ -2996,8 +2998,9 @@ msgstr ""
 "を確認してください。次が報告されたエラーです:"
 
 #: ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js:28
+#, fuzzy
 msgid "Open"
-msgstr "開く"
+msgstr "開く..."
 
 #: ReactNativeClient/lib/components/note-list.js:97
 msgid "You currently have no notebooks."
@@ -3209,8 +3212,9 @@ msgid "AWS S3 bucket"
 msgstr "AWS S3 バケット"
 
 #: ReactNativeClient/lib/models/Setting.js:226
+#, fuzzy
 msgid "AWS S3 URL"
-msgstr "AWS S3 URL"
+msgstr "AWS S3"
 
 #: ReactNativeClient/lib/models/Setting.js:237
 msgid "AWS key"

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.3.2",
+  "version": "1.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

CliClient/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "gulp buildTests -L && node node_modules/jasmine/bin/jasmine.js --fail-fast=true --config=tests/support/jasmine.json",
     "test-ci": "gulp buildTests -L && node node_modules/jasmine/bin/jasmine.js --config=tests/support/jasmine.json",
-    "postinstall": "npm run build && patch-package --patch-dir ./patches",
+    "postinstall": "npm run build && patch-package --patch-dir ../patches/shared && patch-package --patch-dir ../patches/node",
     "build": "gulp build",
     "start": "gulp build -L && node 'build/main.js' --stack-trace-enabled --log-level debug --env dev"
   },
@@ -28,7 +28,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.3.2",
+  "version": "1.3.0",
   "bin": {
     "joplin": "./main.js"
   },

CliClient/tests/EnexToHtml.js

@@ -3,7 +3,6 @@ require('app-module-path').addPath(__dirname);
 const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('test-utils.js');
 const shim = require('lib/shim').default;
 const { enexXmlToHtml } = require('lib/import-enex-html-gen.js');
-const cleanHtml = require('clean-html');
 
 process.on('unhandledRejection', (reason, p) => {
 	console.warn('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -20,20 +19,6 @@ const audioResource = {
 	title: 'audio test',
 };
 
-// All the test HTML files are beautified ones, so we need to run
-// this before the comparison. Before, beautifying was done by `enexXmlToHtml`
-// but that was removed due to problems with the clean-html package.
-const beautifyHtml = (html) => {
-	return new Promise((resolve) => {
-		try {
-			cleanHtml.clean(html, { wrap: 0 }, (...cleanedHtml) => resolve(cleanedHtml.join('')));
-		} catch (error) {
-			console.warn(`Could not clean HTML - the "unclean" version will be used: ${error.message}: ${html.trim().substr(0, 512).replace(/[\n\r]/g, ' ')}...`);
-			resolve([html].join(''));
-		}
-	});
-};
-
 /**
  * Tests the importer for a single note, checking that the result of
  * processing the given `.enex` input file matches the contents of the given
@@ -53,7 +38,7 @@ const compareOutputToExpected = (options) => {
 	it(testTitle, asyncTest(async () => {
 		const enexInput = await shim.fsDriver().readFile(inputFile);
 		const expectedOutput = await shim.fsDriver().readFile(outputFile);
-		const actualOutput = await beautifyHtml(await enexXmlToHtml(enexInput, options.resources));
+		const actualOutput = await enexXmlToHtml(enexInput, options.resources);
 
 		expect(actualOutput).toEqual(expectedOutput);
 	}));

CliClient/tests/fsDriver.ts

@@ -1,25 +1,14 @@
 import FsDriverNode from 'lib/fs-driver-node';
-import shim from 'lib/shim';
 const { expectThrow } = require('test-utils.js');
 
-// On Windows, path.resolve is going to convert a path such as
-// /tmp/file.txt to c:\tmp\file.txt
-function platformPath(path:string) {
-	if (shim.isWindows()) {
-		return `C:${path.replace(/\//g, '\\')}`;
-	} else {
-		return path;
-	}
-}
-
 describe('fsDriver', function() {
 
 	it('should resolveRelativePathWithinDir', () => {
 		const fsDriver = new FsDriverNode();
-		expect(fsDriver.resolveRelativePathWithinDir('/test/temp', './my/file.txt')).toBe(platformPath('/test/temp/my/file.txt'));
-		expect(fsDriver.resolveRelativePathWithinDir('/', './test')).toBe(platformPath('/test'));
-		expect(fsDriver.resolveRelativePathWithinDir('/test', 'myfile.txt')).toBe(platformPath('/test/myfile.txt'));
-		expect(fsDriver.resolveRelativePathWithinDir('/test/temp', './mydir/../test.txt')).toBe(platformPath('/test/temp/test.txt'));
+		expect(fsDriver.resolveRelativePathWithinDir('/test/temp', './my/file.txt')).toBe('/test/temp/my/file.txt');
+		expect(fsDriver.resolveRelativePathWithinDir('/', './test')).toBe('/test');
+		expect(fsDriver.resolveRelativePathWithinDir('/test', 'myfile.txt')).toBe('/test/myfile.txt');
+		expect(fsDriver.resolveRelativePathWithinDir('/test/temp', './mydir/../test.txt')).toBe('/test/temp/test.txt');
 
 		expectThrow(() => fsDriver.resolveRelativePathWithinDir('/test/temp', '../myfile.txt'));
 		expectThrow(() => fsDriver.resolveRelativePathWithinDir('/test/temp', './mydir/../../test.txt'));

CliClient/tests/services_PluginService.ts

@@ -2,10 +2,12 @@ import PluginRunner from '../app/services/plugins/PluginRunner';
 import PluginService from 'lib/services/plugins/PluginService';
 import { ContentScriptType } from 'lib/services/plugins/api/types';
 import MdToHtml from 'lib/joplin-renderer/MdToHtml';
+import Setting from 'lib/models/Setting';
 import shim from 'lib/shim';
+import uuid from 'lib/uuid';
 
 require('app-module-path').addPath(__dirname);
-const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir } = require('test-utils.js');
+const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow } = require('test-utils.js');
 const Note = require('lib/models/Note');
 const Folder = require('lib/models/Folder');
 
@@ -63,9 +65,6 @@ describe('services_PluginService', function() {
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
-
-		// If you have an error here, it might mean you need to run `npm i` from
-		// the "withExternalModules" folder. Not clear exactly why.
 		expect(allFolders[0].title).toBe('  foo');
 	}));
 
@@ -155,14 +154,12 @@ describe('services_PluginService', function() {
 	}));
 
 	it('should register a Markdown-it plugin', asyncTest(async () => {
-		const tempDir = await createTempDir();
-
-		const contentScriptPath = `${tempDir}/markdownItTestPlugin.js`;
+		const contentScriptPath = `${Setting.value('tempDir')}/markdownItTestPlugin${uuid.createNano()}.js`;
 		await shim.fsDriver().copy(`${testPluginDir}/content_script/src/markdownItTestPlugin.js`, contentScriptPath);
 
 		const service = newPluginService();
 
-		const plugin = await service.loadPluginFromString('example', tempDir, `
+		const plugin = await service.loadPluginFromString('example', Setting.value('tempDir'), `
 			/* joplin-manifest:
 			{
 				"manifest_version": 1,
@@ -176,7 +173,7 @@ describe('services_PluginService', function() {
 			
 			joplin.plugins.register({
 				onStart: async function() {
-					await joplin.plugins.registerContentScript('markdownItPlugin', 'justtesting', './markdownItTestPlugin.js');
+					await joplin.plugins.registerContentScript('markdownItPlugin', 'justtesting', '${contentScriptPath}');
 				},
 			});
 		`);
@@ -201,7 +198,7 @@ describe('services_PluginService', function() {
 
 		expect(result.html.includes('JUST TESTING: something')).toBe(true);
 
-		await shim.fsDriver().remove(tempDir);
+		await shim.fsDriver().remove(contentScriptPath);
 	}));
 
 });

CliClient/tests/support/plugins/content_script/src/index.ts

@@ -1,12 +1,7 @@
 import joplin from 'api';
-import { ContentScriptType } from 'api/types';
 
 joplin.plugins.register({
 	onStart: async function() {
-		await joplin.plugins.registerContentScript(
-			ContentScriptType.MarkdownItPlugin,
-			'justtesting',
-			'./markdownItTestPlugin.js'
-		);
+		await joplin.plugins.registerContentScript('markdownItPlugin', 'justtesting', './markdownItTestPlugin.js');
 	},
 });

CliClient/tests/test-utils.js

@@ -80,9 +80,9 @@ EncryptionService.fsDriver_ = fsDriver;
 FileApiDriverLocal.fsDriver_ = fsDriver;
 
 const logDir = `${__dirname}/../tests/logs`;
-const baseTempDir = `${__dirname}/../tests/tmp`;
+const tempDir = `${__dirname}/../tests/tmp`;
 fs.mkdirpSync(logDir, 0o755);
-fs.mkdirpSync(baseTempDir, 0o755);
+fs.mkdirpSync(tempDir, 0o755);
 fs.mkdirpSync(`${__dirname}/data`);
 
 SyncTargetRegistry.addClass(SyncTargetMemory);
@@ -146,7 +146,7 @@ BaseItem.loadClass('Revision', Revision);
 
 Setting.setConstant('appId', 'net.cozic.joplintest-cli');
 Setting.setConstant('appType', 'cli');
-Setting.setConstant('tempDir', baseTempDir);
+Setting.setConstant('tempDir', tempDir);
 Setting.setConstant('env', 'dev');
 
 BaseService.logger_ = logger;
@@ -634,12 +634,6 @@ function tempFilePath(ext) {
 	return `${Setting.value('tempDir')}/${md5(Date.now() + Math.random())}.${ext}`;
 }
 
-async function createTempDir() {
-	const tempDirPath = `${baseTempDir}/${uuid.createNano()}`;
-	await fs.mkdirp(tempDirPath);
-	return tempDirPath;
-}
-
 function mockDate(year, month, day, tick) {
 	const fixedDate = new Date(2020, 0, 1);
 	jasmine.clock().install();
@@ -718,4 +712,4 @@ class TestApp extends BaseApplication {
 	}
 }
 
-module.exports = { synchronizerStart, syncTargetName, setSyncTargetName, syncDir, createTempDir, isNetworkSyncTarget, kvStore, expectThrow, logger, expectNotThrow, resourceService, resourceFetcher, tempFilePath, allSyncTargetItemsEncrypted, msleep, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, checkThrow, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest, currentClientId, id, ids, sortedIds, at, createNTestNotes, createNTestFolders, createNTestTags, mockDate, restoreDate, TestApp };
+module.exports = { synchronizerStart, syncTargetName, setSyncTargetName, syncDir, isNetworkSyncTarget, kvStore, expectThrow, logger, expectNotThrow, resourceService, resourceFetcher, tempFilePath, allSyncTargetItemsEncrypted, msleep, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, checkThrow, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest, currentClientId, id, ids, sortedIds, at, createNTestNotes, createNTestFolders, createNTestTags, mockDate, restoreDate, TestApp };

ElectronClient/checkForUpdates.js

@@ -149,10 +149,8 @@ function checkForUpdates(inBackground, window, logFilePath, options) {
 
 			const result = await dialog.showMessageBox(parentWindow_, {
 				type: 'info',
-				message: `${_('An update is available, do you want to download it now?')}`,
-				detail: `${_('Your version: %s', packageInfo.version)}\n${_('New version: %s', newVersionString)}${releaseNotes}`,
-				buttons: [_('Download'), _('Cancel')].concat(truncateReleaseNotes ? [_('Full Release Notes')] : []),
-				cancelId: 1,
+				message: `${_('An update is available, do you want to download it now?')}\n\n${_('Your version: %s', packageInfo.version)}\n${_('New version: %s', newVersionString)}${releaseNotes}`,
+				buttons: [_('Yes'), _('No')].concat(truncateReleaseNotes ? [_('Full Release Notes')] : []),
 			});
 
 			const buttonIndex = result.response;

ElectronClient/gui/MainScreen/commands/showModalMessage.tsx

@@ -8,9 +8,8 @@ export const declaration:CommandDeclaration = {
 export const runtime = (comp:any):CommandRuntime => {
 	return {
 		execute: async (_context:CommandContext, message:string) => {
-			let brIndex = 1;
 			const lines = message.split('\n').map((line:string) => {
-				if (!line.trim()) return <br key={`${brIndex++}`}/>;
+				if (!line.trim()) return <br/>;
 				return <div key={line} className="text">{line}</div>;
 			});
 

ElectronClient/gui/NoteEditor/utils/contextMenu.ts

@@ -43,14 +43,6 @@ async function resourceInfo(options:ContextMenuOptions):Promise<any> {
 	return { resource, resourcePath };
 }
 
-function handleCopyToClipboard(options:ContextMenuOptions) {
-	if (options.textToCopy) {
-		clipboard.writeText(options.textToCopy);
-	} else if (options.htmlToCopy) {
-		clipboard.writeHTML(options.htmlToCopy);
-	}
-}
-
 export function menuItems():ContextMenuItems {
 	return {
 		open: {
@@ -96,7 +88,7 @@ export function menuItems():ContextMenuItems {
 		cut: {
 			label: _('Cut'),
 			onAction: async (options:ContextMenuOptions) => {
-				handleCopyToClipboard(options);
+				clipboard.writeText(options.textToCopy);
 				options.insertContent('');
 			},
 			isActive: (_itemType:ContextMenuItemType, options:ContextMenuOptions) => !options.isReadOnly && (!!options.textToCopy || !!options.htmlToCopy),
@@ -104,7 +96,11 @@ export function menuItems():ContextMenuItems {
 		copy: {
 			label: _('Copy'),
 			onAction: async (options:ContextMenuOptions) => {
-				handleCopyToClipboard(options);
+				if (options.textToCopy) {
+					clipboard.writeText(options.textToCopy);
+				} else if (options.htmlToCopy) {
+					clipboard.writeHTML(options.htmlToCopy);
+				}
 			},
 			isActive: (_itemType:ContextMenuItemType, options:ContextMenuOptions) => !!options.textToCopy || !!options.htmlToCopy,
 		},
@@ -121,7 +117,7 @@ export function menuItems():ContextMenuItems {
 			onAction: async (options:ContextMenuOptions) => {
 				clipboard.writeText(options.linkToCopy !== null ? options.linkToCopy : options.textToCopy);
 			},
-			isActive: (itemType:ContextMenuItemType, options:ContextMenuOptions) => itemType === ContextMenuItemType.Link || !!options.linkToCopy,
+			isActive: (itemType:ContextMenuItemType) => itemType === ContextMenuItemType.Link,
 		},
 	};
 }

ElectronClient/gui/NoteEditor/utils/useMessageHandler.ts

@@ -41,7 +41,7 @@ export default function useMessageHandler(scrollWhenReady:any, setScrollWhenRead
 				itemType: arg0 && arg0.type,
 				resourceId: arg0.resourceId,
 				textToCopy: arg0.textToCopy,
-				linkToCopy: arg0.linkToCopy || null,
+				linkToCopy: null,
 				htmlToCopy: '',
 				insertContent: () => { console.warn('insertContent() not implemented'); },
 			});

ElectronClient/gui/note-viewer/index.html

@@ -368,12 +368,9 @@
 				const selectedText = window.getSelection().toString();
 
 				if (selectedText) {
-					const linkToCopy = event.target && event.target.getAttribute('href') ? event.target.getAttribute('href') : null;
-
 					ipcProxySendToHost('contextMenu', {
 						type: 'text',
 						textToCopy: selectedText,
-						linkToCopy: linkToCopy,
 					});
 				} else if (event.target.getAttribute('href')) {
 					ipcProxySendToHost('contextMenu', {

ElectronClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.3.9",
+  "version": "1.3.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

ElectronClient/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.3.9",
+  "version": "1.3.8",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {

README.md

@@ -28,7 +28,7 @@ Linux          | <a href='https://github.com/laurent22/joplin/releases/download/
 
 Operating System | Download | Alt. Download
 -----------------|----------|----------------
-Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.3.9/joplin-v1.3.9.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.3.9/joplin-v1.3.9-32bit.apk)
+Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.2.6/joplin-v1.2.6.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.2.6/joplin-v1.2.6-32bit.apk)
 iOS              | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplinapp.org/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application

ReactNativeClient/android/app/build.gradle

@@ -132,8 +132,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097597
-		versionName "1.3.9"
+		versionCode 2097596
+		versionName "1.3.8"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}

ReactNativeClient/lib/components/shared/side-menu-shared.js

@@ -51,10 +51,7 @@ shared.renderFolders = function(props, renderItem) {
 shared.renderTags = function(props, renderItem) {
 	const tags = props.tags.slice();
 	tags.sort((a, b) => {
-		// Note: while newly created tags are normalized and lowercase
-		// imported tags might be any case, so we need to do case-insensitive
-		// sort.
-		return a.title.toLowerCase() < b.title.toLowerCase() ? -1 : +1;
+		return a.title < b.title ? -1 : +1;
 	});
 	const tagItems = [];
 	const order = [];
@@ -69,6 +66,21 @@ shared.renderTags = function(props, renderItem) {
 	};
 };
 
+// shared.renderSearches = function(props, renderItem) {
+// 	let searches = props.searches.slice();
+// 	let searchItems = [];
+// 	const order = [];
+// 	for (let i = 0; i < searches.length; i++) {
+// 		const search = searches[i];
+// 		order.push(search.id);
+// 		searchItems.push(renderItem(search, props.selectedSearchId == search.id && props.notesParentType == 'Search'));
+// 	}
+// 	return {
+// 		items: searchItems,
+// 		order: order,
+// 	};
+// }
+
 shared.synchronize_press = async function(comp) {
 	const { reg } = require('lib/registry.js');
 

ReactNativeClient/lib/fs-driver-node.ts

@@ -195,14 +195,13 @@ export default class FsDriverNode extends FsDriverBase {
 	public resolve(path:string) {
 		return require('path').resolve(path);
 	}
-
+	
 	// Resolves the provided relative path to an absolute path within baseDir. The function
 	// also checks that the absolute path is within baseDir, to avoid security issues.
 	// It is expected that baseDir is a safe path (not user-provided).
 	public resolveRelativePathWithinDir(baseDir:string, relativePath:string) {
-		const resolvedBaseDir = nodeResolve(baseDir);
 		const resolvedPath = nodeResolve(baseDir, relativePath);
-		if (resolvedPath.indexOf(resolvedBaseDir) !== 0) throw new Error(`Resolved path for relative path "${relativePath}" is not within base directory "${baseDir}" (Was resolved to ${resolvedPath})`);
+		if (resolvedPath.indexOf(baseDir) !== 0) throw new Error('Resolved path for relative path "' + relativePath + '" is not within base directory "' + baseDir + '"');
 		return resolvedPath;
 	}
 

ReactNativeClient/lib/models/Tag.js

@@ -66,23 +66,10 @@ class Tag extends BaseItem {
 			note_id: noteId,
 		});
 
-		// While syncing or importing notes, the app might associate a tag ID with a note ID
-		// but the actual items might not have been downloaded yet, so
-		// check that we actually get some result before dispatching
-		// the action.
-		//
-		// Fixes: https://github.com/laurent22/joplin/issues/3958#issuecomment-714320526
-		//
-		// Also probably fixes the errors on GitHub about reducer
-		// items being undefined.
-		const tagWithCount = await Tag.loadWithCount(tagId);
-
-		if (tagWithCount) {
-			this.dispatch({
-				type: 'TAG_UPDATE_ONE',
-				item: tagWithCount,
-			});
-		}
+		this.dispatch({
+			type: 'TAG_UPDATE_ONE',
+			item: await Tag.loadWithCount(tagId),
+		});
 
 		return output;
 	}

ReactNativeClient/lib/services/plugins/BasePluginRunner.ts

@@ -4,7 +4,7 @@ import Global from './api/Global';
 
 export default abstract class BasePluginRunner extends BaseService {
 
-	async run(plugin:Plugin, sandbox:Global):Promise<void> {
+	async run(plugin:Plugin, sandbox:Global) {
 		throw new Error(`Not implemented: ${plugin} / ${sandbox}`);
 	}
 

ReactNativeClient/lib/services/plugins/Plugin.ts

@@ -4,7 +4,6 @@ import shim from 'lib/shim';
 import { ViewHandle } from './utils/createViewHandle';
 import { ContentScriptType } from './api/types';
 import Logger from 'lib/Logger';
-const EventEmitter = require('events');
 
 interface ViewControllers {
 	[key:string]: ViewController
@@ -30,7 +29,6 @@ export default class Plugin {
 	private viewControllers_:ViewControllers = {};
 	private contentScripts_:ContentScripts = {};
 	private dispatch_:Function;
-	private eventEmitter_:any;
 
 	constructor(id:string, baseDir:string, manifest:PluginManifest, scriptText:string, logger:Logger, dispatch:Function) {
 		this.id_ = id;
@@ -39,7 +37,6 @@ export default class Plugin {
 		this.scriptText_ = scriptText;
 		this.logger_ = logger;
 		this.dispatch_ = dispatch;
-		this.eventEmitter_ = new EventEmitter();
 	}
 
 	public get id():string {
@@ -62,25 +59,11 @@ export default class Plugin {
 		return this.baseDir_;
 	}
 
-	on(eventName:string, callback:Function) {
-		return this.eventEmitter_.on(eventName, callback);
-	}
-
-	off(eventName:string, callback:Function) {
-		return this.eventEmitter_.removeListener(eventName, callback);
-	}
-
-	emit(eventName:string, event:any = null) {
-		return this.eventEmitter_.emit(eventName, event);
-	}
-
-	public async registerContentScript(type:ContentScriptType, id:string, path:string) {
+	public registerContentScript(type:ContentScriptType, id:string, path:string) {
 		if (!this.contentScripts_[type]) this.contentScripts_[type] = [];
 
 		const absolutePath = shim.fsDriver().resolveRelativePathWithinDir(this.baseDir, path);
 
-		if (!(await shim.fsDriver().exists(absolutePath))) throw new Error(`Could not find content script at path ${absolutePath}`);
-
 		this.contentScripts_[type].push({ id, path: absolutePath });
 
 		this.logger_.debug(`Plugin: ${this.id}: Registered content script: ${type}: ${id}: ${absolutePath}`);

ReactNativeClient/lib/services/plugins/api/JoplinPlugins.ts

@@ -45,7 +45,6 @@ export default class JoplinPlugins {
 				this.logger.error(`In plugin ${this.plugin.id}:`, newError);
 			}).then(() => {
 				this.logger.info(`Finished running onStart handler: ${this.plugin.id} (Took ${Date.now() - startTime}ms)`);
-				this.plugin.emit('started');
 			});
 		}
 	}

ReactNativeClient/lib/services/plugins/api/types.ts

@@ -320,30 +320,36 @@ export type Path = string[];
 
 export enum ContentScriptType {
 	/**
-	 * Registers a new Markdown-It plugin, which should follow the template below.
+	 * Registers a new Markdown-It plugin, which should follow this template:
 	 *
 	 * ```javascript
+	 * // The module should export an object as below:
+	 *
 	 * module.exports = {
+	 *
+	 *     // The "context" variable is currently unused but could be used later on to provide
+	 *     // access to your own plugin so that the content script and plugin can communicate.
 	 *     default: function(context) {
 	 *         return {
+	 *
+	 *             // This is the actual Markdown-It plugin - check the [official doc](https://github.com/markdown-it/markdown-it) for more information
+	 *             // The `options` parameter is of type [RuleOptions](https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml.ts), which
+	 *             // contains a number of options, mostly useful for Joplin's internal code.
 	 *             plugin: function(markdownIt, options) {
 	 *                 // ...
 	 *             },
-	 *             assets: {
-	 *                 // ...
-	 *             },
+	 *
+	 *             // You may also specify additional assets such as JS or CSS that should be loaded in the rendered HTML document.
+	 *             // Check for example the Joplin [Mermaid plugin](https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.ts) to
+	 *             // see how the data should be structured.
+	 *             assets: {},
 	 *         }
 	 *     }
 	 * }
 	 * ```
 	 *
-	 * - The `context` argument is currently unused but could be used later on to provide access to your own plugin so that the content script and plugin can communicate.
-	 *
-	 * - The **required** `plugin` key is the actual Markdown-It plugin - check the [official doc](https://github.com/markdown-it/markdown-it) for more information. The `options` parameter is of type [RuleOptions](https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml.ts), which contains a number of options, mostly useful for Joplin's internal code.
-	 *
-	 * - Using the **optional** `assets` key you may specify assets such as JS or CSS that should be loaded in the rendered HTML document. Check for example the Joplin [Mermaid plugin](https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.ts) to see how the data should be structured.
-	 *
-	 * To include a regular Markdown-It plugin, that doesn't make use of any Joplin-specific features, you would simply create a file such as this:
+	 * To include a regular Markdown-It plugin, that doesn't make use of any Joplin-specific feature, you
+	 * would simply create a file such as this:
 	 *
 	 * ```javascript
 	 * module.exports = {

ReactNativeClient/lib/services/plugins/utils/contentScriptsToRendererRules.ts

@@ -1,26 +1,22 @@
 import { PluginStates } from '../reducer';
 import { ExtraRendererRule } from 'lib/joplin-renderer/MdToHtml';
-import { ContentScriptType } from '../api/types';
 
 export default function contentScriptsToRendererRules(plugins:PluginStates):ExtraRendererRule[] {
 	const output:ExtraRendererRule[] = [];
 
 	for (const pluginId in plugins) {
 		const plugin = plugins[pluginId];
-		const contentScripts = plugin.contentScripts[ContentScriptType.MarkdownItPlugin];
-		if (!contentScripts) continue;
+		for (const scriptType in plugin.contentScripts) {
+			const contentScripts = plugin.contentScripts[scriptType];
+			for (const contentScript of contentScripts) {
 
-		for (const contentScript of contentScripts) {
-			const module = require(contentScript.path);
-			if (!module.default || typeof module.default !== 'function') throw new Error(`Content script must export a function under the "default" key: Plugin: ${pluginId}: Script: ${contentScript.id}`);
+				const loadedModule = require(contentScript.path).default;
 
-			const loadedModule = module.default({});
-			if (!loadedModule.plugin) throw new Error(`Content script must export a "plugin" key: Plugin: ${pluginId}: Script: ${contentScript.id}`);
-
-			output.push({
-				id: contentScript.id,
-				module: loadedModule,
-			});
+				output.push({
+					id: contentScript.id,
+					module: loadedModule({}),
+				});
+			}
 		}
 	}
 

ReactNativeClient/lib/services/searchengine/SearchEngine.js

@@ -577,22 +577,6 @@ class SearchEngine {
 			keys.push(col);
 		}
 
-		//
-		// The object "allTerms" is used for query construction purposes (this contains all the filter terms)
-		// Since this is used for the FTS match query, we need to normalize text, title and body terms.
-		// Note, we're not normalizing terms like tag because these are matched using SQL LIKE operator and so we must preserve their diacritics.
-		//
-		// The object "terms" only include text, title, body terms and is used for highlighting.
-		// By not normalizing the text, title, body in "terms", highlighting still works correctly for words with diacritics.
-		//
-
-		allTerms = allTerms.map(x => {
-			if (x.name === 'text' || x.name === 'title' || x.name === 'body') {
-				return Object.assign(x, { value: this.normalizeText_(x.value) });
-			}
-			return x;
-		});
-
 		return {
 			termCount: termCount,
 			keys: keys,
@@ -651,15 +635,7 @@ class SearchEngine {
 		// If preferredSearchType is "fts" we auto-detect anyway
 		// because it's not always supported.
 
-		let allTerms = [];
-		try {
-			allTerms = filterParser(query);
-		} catch (error) {
-			console.warn(error);
-		}
-
-		const textQuery = allTerms.filter(x => x.name === 'text' || x.name == 'title' || x.name == 'body').map(x => x.value).join(' ');
-		const st = scriptType(textQuery);
+		const st = scriptType(query);
 
 		if (!Setting.value('db.ftsEnabled') || ['ja', 'zh', 'ko', 'th'].indexOf(st) >= 0) {
 			return SearchEngine.SEARCH_TYPE_BASIC;
@@ -677,11 +653,12 @@ class SearchEngine {
 			fuzzy: Setting.value('db.fuzzySearchEnabled') === 1,
 		}, options);
 
+		searchString = this.normalizeText_(searchString);
+
 		const searchType = this.determineSearchType_(searchString, options);
 
 		if (searchType === SearchEngine.SEARCH_TYPE_BASIC) {
 			// Non-alphabetical languages aren't support by SQLite FTS (except with extensions which are not available in all platforms)
-			searchString = this.normalizeText_(searchString);
 			const rows = await this.basicSearch(searchString);
 			const parsedQuery = await this.parseQuery(searchString);
 			this.processResults_(rows, parsedQuery, true);

docs/api/references/plugin_api/enums/contentscripttype.html

@@ -95,29 +95,33 @@
 					</aside>
 					<div class="tsd-comment tsd-typography">
 						<div class="lead">
-							<p>Registers a new Markdown-It plugin, which should follow the template below.</p>
+							<p>Registers a new Markdown-It plugin, which should follow this template:</p>
 						</div>
-						<pre><code class="language-javascript"><span class="hljs-built_in">module</span>.exports = {
+						<pre><code class="language-javascript"><span class="hljs-comment">// The module should export an object as below:</span>
+
+<span class="hljs-built_in">module</span>.exports = {
+
+    <span class="hljs-comment">// The &quot;context&quot; variable is currently unused but could be used later on to provide</span>
+    <span class="hljs-comment">// access to your own plugin so that the content script and plugin can communicate.</span>
     <span class="hljs-attr">default</span>: <span class="hljs-function"><span class="hljs-keyword">function</span>(<span class="hljs-params">context</span>) </span>{
         <span class="hljs-keyword">return</span> {
+
+            <span class="hljs-comment">// This is the actual Markdown-It plugin - check the [official doc](https://github.com/markdown-it/markdown-it) for more information</span>
+            <span class="hljs-comment">// The `options` parameter is of type [RuleOptions](https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml.ts), which</span>
+            <span class="hljs-comment">// contains a number of options, mostly useful for Joplin&#x27;s internal code.</span>
             <span class="hljs-attr">plugin</span>: <span class="hljs-function"><span class="hljs-keyword">function</span>(<span class="hljs-params">markdownIt, options</span>) </span>{
                 <span class="hljs-comment">// ...</span>
             },
-            <span class="hljs-attr">assets</span>: {
-                <span class="hljs-comment">// ...</span>
-            },
+
+            <span class="hljs-comment">// You may also specify additional assets such as JS or CSS that should be loaded in the rendered HTML document.</span>
+            <span class="hljs-comment">// Check for example the Joplin [Mermaid plugin](https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.ts) to</span>
+            <span class="hljs-comment">// see how the data should be structured.</span>
+            <span class="hljs-attr">assets</span>: {},
         }
     }
 }</code></pre>
-						<ul>
-							<li><p>The <code>context</code> argument is currently unused but could be used later on to provide access to your own plugin so that the content script and plugin can communicate.</p>
-							</li>
-							<li><p>The <strong>required</strong> <code>plugin</code> key is the actual Markdown-It plugin - check the <a href="https://github.com/markdown-it/markdown-it">official doc</a> for more information. The <code>options</code> parameter is of type <a href="https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml.ts">RuleOptions</a>, which contains a number of options, mostly useful for Joplin&#39;s internal code.</p>
-							</li>
-							<li><p>Using the <strong>optional</strong> <code>assets</code> key you may specify assets such as JS or CSS that should be loaded in the rendered HTML document. Check for example the Joplin <a href="https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.ts">Mermaid plugin</a> to see how the data should be structured.</p>
-							</li>
-						</ul>
-						<p>To include a regular Markdown-It plugin, that doesn&#39;t make use of any Joplin-specific features, you would simply create a file such as this:</p>
+						<p>To include a regular Markdown-It plugin, that doesn&#39;t make use of any Joplin-specific feature, you
+						would simply create a file such as this:</p>
 						<pre><code class="language-javascript"><span class="hljs-built_in">module</span>.exports = {
     <span class="hljs-attr">default</span>: <span class="hljs-function"><span class="hljs-keyword">function</span>(<span class="hljs-params">context</span>) </span>{
         <span class="hljs-keyword">return</span> {

docs/debugging/index.html

@@ -395,7 +395,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <p>It is possible to get the apps to display or log more information that might help debug various issues.</p>
 <h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
 <ul>
-<li>Click on menu <strong>Help &gt; Open Profile Directory</strong> and add a file named &quot;flags.txt&quot; in your directory with the following content: <code>--open-dev-tools --debug --log-level debug</code></li>
+<li>Add a file named &quot;flags.txt&quot; in the config directory (should be <code>~/.config/joplin-desktop</code> or <code>c:\Users\YOUR_NAME\.config\joplin-desktop</code>) with the following content: <code>--open-dev-tools --debug --log-level debug</code></li>
 <li>Restart the application</li>
 <li>The development tools should now be opened. Click the &quot;Console&quot; tab</li>
 <li>Now repeat the action that was causing problem. The console might output warnings or errors - please add them to the GitHub issue. Also open log.txt in the config folder and if there is any error or warning, please also add them to the issue.</li>
@@ -403,11 +403,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <h2>CLI application<a name="cli-application" href="#cli-application" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Start the app with <code>joplin --debug --log-level debug</code></li>
-<li>Check log.txt as specified above for the desktop application and attach the log to the GitHub issue (or just the warnings/errors if any). The profile directory would be in <code>~/.config/joplin</code>.</li>
+<li>Check the log.txt as specified above for the desktop application and attach the log to the GitHub issue (or just the warnings/errors if any)</li>
 </ul>
 <h2>Mobile application<a name="mobile-application" href="#mobile-application" class="heading-anchor">🔗</a></h2>
 <ul>
-<li>In the Configuration screen, press on the <strong>Log button</strong> and post a screenshot of any error/warning.</li>
+<li>In the options, enable Advanced Option</li>
+<li>Open the log in the top right hand corner menu and post a screenshot of any error/warning.</li>
 </ul>
 <h1>Creating a low-level bug report on Android<a name="creating-a-low-level-bug-report-on-android" href="#creating-a-low-level-bug-report-on-android" class="heading-anchor">🔗</a></h1>
 <p><a href="https://developer.android.com/studio/debug/bug-report">https://developer.android.com/studio/debug/bug-report</a></p>

docs/index.html

@@ -791,9 +791,9 @@ Details:
 </tr>
 </tbody>
 </table>
-<p>Note: In the CLI client you have to escape the query using <code>--</code> when using negated filters.<br>
+<p>Note: In CliClient you have to escape the query using <code>--</code> when using negated filters.<br>
 Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
-<p>The filters are implicitly connected by and/or connectives depending on the following rules:</p>
+<p>The filters are implicitely connected by and/or connective depending on the following rules;</p>
 <ul>
 <li>By default, all filters are connected by &quot;AND&quot;.</li>
 <li>To override this default behaviour, use the <code>any</code> filter, in which case the search terms will be connected by &quot;OR&quot; instead.</li>
@@ -878,71 +878,71 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" alt=""></td>
 <td>Arabic</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/ar.po">ar</a></td>
-<td><a href="mailto:fi_ahmed_bacha@esi.dz">أحمد باشا إبراهيم</a></td>
-<td>79%</td>
+<td>أحمد باشا إبراهيم (<a href="mailto:fi_ahmed_bacha@esi.dz">fi_ahmed_bacha@esi.dz</a>)</td>
+<td>80%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/basque_country.png" alt=""></td>
 <td>Basque</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/eu.po">eu</a></td>
 <td>juan.abasolo@ehu.eus</td>
-<td>33%</td>
+<td>34%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ba.png" alt=""></td>
 <td>Bosnian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/bs_BA.po">bs_BA</a></td>
-<td><a href="mailto:dervis.t@pm.me">Derviš T.</a></td>
-<td>82%</td>
+<td>Derviš T. (<a href="mailto:dervis.t@pm.me">dervis.t@pm.me</a>)</td>
+<td>83%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/bg.png" alt=""></td>
 <td>Bulgarian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/bg_BG.po">bg_BG</a></td>
 <td></td>
-<td>65%</td>
+<td>66%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/catalonia.png" alt=""></td>
 <td>Catalan</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/ca.po">ca</a></td>
 <td>jmontane, 2019</td>
-<td>95%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hr.png" alt=""></td>
 <td>Croatian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/hr_HR.po">hr_HR</a></td>
-<td><a href="mailto:trbuhom@net.hr">Hrvoje Mandić</a></td>
+<td>Hrvoje Mandić (<a href="mailto:trbuhom@net.hr">trbuhom@net.hr</a>)</td>
 <td>27%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cz.png" alt=""></td>
 <td>Czech</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/cs_CZ.po">cs_CZ</a></td>
-<td><a href="mailto:lukas@aiya.cz">Lukas Helebrandt</a></td>
-<td>99%</td>
+<td>Lukas Helebrandt (<a href="mailto:lukas@aiya.cz">lukas@aiya.cz</a>)</td>
+<td>82%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/dk.png" alt=""></td>
 <td>Dansk</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/da_DK.po">da_DK</a></td>
-<td><a href="mailto:mjjzf@syntaktisk.">Morten Juhl-Johansen Zölde-Fejér</a></td>
-<td>73%</td>
+<td>Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk.</td>
+<td>74%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/de.png" alt=""></td>
 <td>Deutsch</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/de_DE.po">de_DE</a></td>
-<td><a href="mailto:atalanttore@users.noreply.github.com">Ettore Atalan</a></td>
-<td>97%</td>
+<td>Ettore Atalan (<a href="mailto:atalanttore@users.noreply.github.com">atalanttore@users.noreply.github.com</a>)</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ee.png" alt=""></td>
 <td>Eesti Keel</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/et_EE.po">et_EE</a></td>
 <td></td>
-<td>65%</td>
+<td>66%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gb.png" alt=""></td>
@@ -962,98 +962,98 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/es.png" alt=""></td>
 <td>Español</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/es_ES.po">es_ES</a></td>
-<td><a href="mailto:andros@fenollosa.email">Andros Fenollosa</a></td>
-<td>99%</td>
+<td>Fernando Pindado (<a href="mailto:fpindado@gmail.com">fpindado@gmail.com</a>)</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/esperanto.png" alt=""></td>
 <td>Esperanto</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/eo.po">eo</a></td>
 <td>Marton Paulo</td>
-<td>37%</td>
+<td>38%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fr.png" alt=""></td>
 <td>Français</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/fr_FR.po">fr_FR</a></td>
 <td>Laurent Cozic</td>
-<td>98%</td>
+<td>99%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/galicia.png" alt=""></td>
 <td>Galician</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/gl_ES.po">gl_ES</a></td>
-<td><a href="mailto:marcoslansgarza@gmail.com">Marcos Lans</a></td>
-<td>42%</td>
+<td>Marcos Lans (<a href="mailto:marcoslansgarza@gmail.com">marcoslansgarza@gmail.com</a>)</td>
+<td>43%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/id.png" alt=""></td>
 <td>Indonesian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/id_ID.po">id_ID</a></td>
-<td><a href="mailto:16875937+fathyar@users.noreply.github.com">Fathy AR</a></td>
-<td>92%</td>
+<td>Fathy AR (<a href="mailto:16875937+fathyar@users.noreply.github.com">16875937+fathyar@users.noreply.github.com</a>)</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/it.png" alt=""></td>
 <td>Italiano</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/it_IT.po">it_IT</a></td>
-<td><a href="mailto:mailfilledwithspam@gmail.com">Alessandro Bernardello</a></td>
-<td>98%</td>
+<td>StarFang208</td>
+<td>90%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/be.png" alt=""></td>
 <td>Nederlands</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/nl_BE.po">nl_BE</a></td>
 <td></td>
-<td>33%</td>
+<td>34%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/nl.png" alt=""></td>
 <td>Nederlands</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/nl_NL.po">nl_NL</a></td>
-<td><a href="mailto:metbril@users.noreply.github.com">MetBril</a></td>
-<td>94%</td>
+<td>MetBril (<a href="mailto:metbril@users.noreply.github.com">metbril@users.noreply.github.com</a>)</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/no.png" alt=""></td>
 <td>Norwegian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/nb_NO.po">nb_NO</a></td>
-<td><a href="mailto:code@mxe.no">Mats Estensen</a></td>
-<td>87%</td>
+<td>Mats Estensen (<a href="mailto:code@mxe.no">code@mxe.no</a>)</td>
+<td>88%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ir.png" alt=""></td>
 <td>Persian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/fa.po">fa</a></td>
-<td><a href="mailto:kourox@protonmail.com">Kourosh Firoozbakht</a></td>
-<td>82%</td>
+<td>Kourosh Firoozbakht (<a href="mailto:kourox@protonmail.com">kourox@protonmail.com</a>)</td>
+<td>83%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pl.png" alt=""></td>
 <td>Polski</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/pl_PL.po">pl_PL</a></td>
 <td></td>
-<td>97%</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pt.png" alt=""></td>
 <td>Português</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/pt_PT.po">pt_PT</a></td>
-<td><a href="mailto:jduar@protonmail.com">João Duarte</a></td>
-<td>98%</td>
+<td>Diogo Caveiro</td>
+<td>88%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/br.png" alt=""></td>
 <td>Português (Brasil)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/pt_BR.po">pt_BR</a></td>
-<td><a href="mailto:rnbastos@gmail.com">Renato Nunes Bastos</a></td>
-<td>95%</td>
+<td>Renato Nunes Bastos (<a href="mailto:rnbastos@gmail.com">rnbastos@gmail.com</a>)</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ro.png" alt=""></td>
 <td>Română</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/ro.po">ro</a></td>
-<td><a href="mailto:cristi.duluta@gmail.com">Cristi Duluta</a></td>
+<td>Cristi Duluta (<a href="mailto:cristi.duluta@gmail.com">cristi.duluta@gmail.com</a>)</td>
 <td>77%</td>
 </tr>
 <tr>
@@ -1067,7 +1067,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/se.png" alt=""></td>
 <td>Svenska</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/sv.po">sv</a></td>
-<td><a href="mailto:jonatan@autistici.org">Jonatan Nyberg</a></td>
+<td>Jonatan Nyberg (<a href="mailto:jonatan@autistici.org">jonatan@autistici.org</a>)</td>
 <td>70%</td>
 </tr>
 <tr>
@@ -1082,63 +1082,63 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Tiếng Việt</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/vi.po">vi</a></td>
 <td></td>
-<td>84%</td>
+<td>85%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tr.png" alt=""></td>
 <td>Türkçe</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/tr_TR.po">tr_TR</a></td>
-<td><a href="mailto:arda@kilicdagi.com">Arda Kılıçdağı</a></td>
-<td>97%</td>
+<td>Arda Kılıçdağı (<a href="mailto:arda@kilicdagi.com">arda@kilicdagi.com</a>)</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gr.png" alt=""></td>
 <td>Ελληνικά</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/el_GR.po">el_GR</a></td>
-<td><a href="mailto:xaris@tuta.io">Harris Arvanitis</a></td>
-<td>95%</td>
+<td>Harris Arvanitis (<a href="mailto:xaris@tuta.io">xaris@tuta.io</a>)</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ru.png" alt=""></td>
 <td>Русский</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/ru_RU.po">ru_RU</a></td>
-<td><a href="mailto:thesermanarm@gmail.com">Sergey Segeda</a></td>
-<td>94%</td>
+<td>Sergey Segeda (<a href="mailto:thesermanarm@gmail.com">thesermanarm@gmail.com</a>)</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/rs.png" alt=""></td>
 <td>српски језик</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/sr_RS.po">sr_RS</a></td>
 <td></td>
-<td>70%</td>
+<td>71%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cn.png" alt=""></td>
 <td>中文 (简体)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/zh_CN.po">zh_CN</a></td>
-<td><a href="mailto:fungdaat31@outlook.com">WhiredPlanck</a></td>
-<td>95%</td>
+<td>WhiredPlanck (<a href="mailto:fungdaat31@outlook.com">fungdaat31@outlook.com</a>)</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tw.png" alt=""></td>
 <td>中文 (繁體)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/zh_TW.po">zh_TW</a></td>
-<td><a href="mailto:yaozeye@yahoo.co.jp">Yaoze Ye</a></td>
-<td>94%</td>
+<td>Yaoze Ye (<a href="mailto:yaozeye@yahoo.co.jp">yaozeye@yahoo.co.jp</a>)</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/jp.png" alt=""></td>
 <td>日本語</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/ja_JP.po">ja_JP</a></td>
-<td><a href="mailto:genneko217@gmail.com">genneko</a></td>
-<td>97%</td>
+<td>genneko (<a href="mailto:genneko217@gmail.com">genneko217@gmail.com</a>)</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/kr.png" alt=""></td>
 <td>한국어</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/CliClient/locales/ko.po">ko</a></td>
-<td><a href="mailto:potatogim@potatogim.net">Ji-Hyeon Gim</a></td>
-<td>99%</td>
+<td>Ji-Hyeon Gim (<a href="mailto:potatogim@potatogim.net">potatogim@potatogim.net</a>)</td>
+<td>98%</td>
 </tr>
 </tbody>
 </table>

readme/changelog_cli.md

@@ -1,21 +1,5 @@
 # Joplin terminal app changelog
 
-## [cli-v1.3.2](https://github.com/laurent22/joplin/releases/tag/cli-v1.3.2) - 2020-10-23T15:57:46Z
-
-- Improved: Added support for a custom S3 URL (#3921) (#3691 by [@aaron](https://github.com/aaron))
-- Improved: Allow setting note geolocation attributes via API (#3884)
-- Improved: Import <strike>,<s> tags (strikethrough) from Evernote (#3936 by Ian Slinger)
-- Improved: Removed OneDrive Dev sync target which was not really useful
-- Improved: Sort search results by average of multiple criteria, including 'Sort notes by' field setting (#3777 by [@shawnaxsom](https://github.com/shawnaxsom))
-- Improved: Sort tags in a case-insensitive way
-- Improved: Updated installation script with BSD support (#3930 by Andros Fenollosa)
-- Fixed: Crash when trying to change app locale (#3847)
-- Fixed: Fix search filters when language is in Korean or with accents (#3947 by Naveen M V)
-- Fixed: Fixed freeze when importing ENEX as HTML, and fixed potential error when importing resources (#3958)
-- Fixed: Fixed setting issue that would cause a password to be saved in plain text in the database, even when the keychain is working
-- Fixed: Importing ENEX as HTML was importing as Markdown (#3923)
-- Fixed: Regression: Fix export of pluginAssets when exporting to html/pdf (#3927 by Caleb John)
-
 ## [cli-v1.2.3](https://github.com/laurent22/joplin/releases/tag/cli-v1.2.3) - 2020-10-09T11:17:18Z
 
 - Improved: Improved handling of database migration failures

readme/debugging.md

@@ -4,7 +4,7 @@ It is possible to get the apps to display or log more information that might hel
 
 ## Desktop application
 
-- Click on menu **Help > Open Profile Directory** and add a file named "flags.txt" in your directory with the following content: `--open-dev-tools --debug --log-level debug`
+- Add a file named "flags.txt" in the config directory (should be `~/.config/joplin-desktop` or `c:\Users\YOUR_NAME\.config\joplin-desktop`) with the following content: `--open-dev-tools --debug --log-level debug`
 - Restart the application
 - The development tools should now be opened. Click the "Console" tab
 - Now repeat the action that was causing problem. The console might output warnings or errors - please add them to the GitHub issue. Also open log.txt in the config folder and if there is any error or warning, please also add them to the issue.
@@ -12,11 +12,12 @@ It is possible to get the apps to display or log more information that might hel
 ## CLI application
 
 - Start the app with `joplin --debug --log-level debug`
-- Check log.txt as specified above for the desktop application and attach the log to the GitHub issue (or just the warnings/errors if any). The profile directory would be in `~/.config/joplin`.
+- Check the log.txt as specified above for the desktop application and attach the log to the GitHub issue (or just the warnings/errors if any)
 
 ## Mobile application
 
-- In the Configuration screen, press on the **Log button** and post a screenshot of any error/warning.
+- In the options, enable Advanced Option
+- Open the log in the top right hand corner menu and post a screenshot of any error/warning.
 
 # Creating a low-level bug report on Android