tests

When the mobile application tries to synchronize a note with attached
resource files, e.g. from the notebook "Welcome! (Mobile)", readFile()
is called to return a Buffer although that isn't implemented in
FsDriverRN.readFile(). This is changing the code to return base64
encoded content from react-native and turn it into a Buffer before the S3
putObject() API call is used to create the remote object.

Tested with AVD Android 10.0 target.

Signed-off-by: Jan Blunck <jblunck@users.noreply.github.com>

.eslintignore

@@ -46,6 +46,7 @@ packages/app-mobile/ios
 packages/app-mobile/locales
 packages/app-mobile/node_modules
 packages/app-mobile/pluginAssets/
+packages/app-mobile/lib/rnInjectedJs/
 packages/lib/assets/
 packages/lib/rnInjectedJs/
 packages/lib/vendor/
@@ -58,105 +59,15 @@ plugin_types/
 readme/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.js
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.js
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.js
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.js.map
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/LinkSelector.js.map
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
-packages/app-cli/build/LinkSelector.d.ts
-packages/app-cli/build/LinkSelector.js
-packages/app-cli/build/LinkSelector.js.map
-packages/app-cli/build/services/plugins/PluginRunner.d.ts
-packages/app-cli/build/services/plugins/PluginRunner.js
-packages/app-cli/build/services/plugins/PluginRunner.js.map
+packages/app-cli/tests/EnexToMd.d.ts
+packages/app-cli/tests/EnexToMd.js
+packages/app-cli/tests/EnexToMd.js.map
 packages/app-cli/tests/InMemoryCache.d.ts
 packages/app-cli/tests/InMemoryCache.js
 packages/app-cli/tests/InMemoryCache.js.map
@@ -175,6 +86,9 @@ packages/app-cli/tests/models_Note.js.map
 packages/app-cli/tests/models_Setting.d.ts
 packages/app-cli/tests/models_Setting.js
 packages/app-cli/tests/models_Setting.js.map
+packages/app-cli/tests/services/plugins/api/JoplinWorkspace.d.ts
+packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js
+packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js.map
 packages/app-cli/tests/services/plugins/sandboxProxy.d.ts
 packages/app-cli/tests/services/plugins/sandboxProxy.js
 packages/app-cli/tests/services/plugins/sandboxProxy.js.map
@@ -196,6 +110,15 @@ packages/app-cli/tests/services_keychainService.js.map
 packages/app-cli/tests/services_rest_Api.d.ts
 packages/app-cli/tests/services_rest_Api.js
 packages/app-cli/tests/services_rest_Api.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js.map
 packages/app-cli/tests/support/plugins/content_script/api/index.d.ts
 packages/app-cli/tests/support/plugins/content_script/api/index.js
 packages/app-cli/tests/support/plugins/content_script/api/index.js.map
@@ -232,6 +155,15 @@ packages/app-cli/tests/support/plugins/events/api/types.js.map
 packages/app-cli/tests/support/plugins/events/src/index.d.ts
 packages/app-cli/tests/support/plugins/events/src/index.js
 packages/app-cli/tests/support/plugins/events/src/index.js.map
+packages/app-cli/tests/support/plugins/jpl_test/api/index.d.ts
+packages/app-cli/tests/support/plugins/jpl_test/api/index.js
+packages/app-cli/tests/support/plugins/jpl_test/api/index.js.map
+packages/app-cli/tests/support/plugins/jpl_test/api/types.d.ts
+packages/app-cli/tests/support/plugins/jpl_test/api/types.js
+packages/app-cli/tests/support/plugins/jpl_test/api/types.js.map
+packages/app-cli/tests/support/plugins/jpl_test/src/index.d.ts
+packages/app-cli/tests/support/plugins/jpl_test/src/index.js
+packages/app-cli/tests/support/plugins/jpl_test/src/index.js.map
 packages/app-cli/tests/support/plugins/json_export/api/index.d.ts
 packages/app-cli/tests/support/plugins/json_export/api/index.js
 packages/app-cli/tests/support/plugins/json_export/api/index.js.map
@@ -325,6 +257,12 @@ packages/app-desktop/bridge.js.map
 packages/app-desktop/commands/copyDevCommand.d.ts
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyDevCommand.js.map
+packages/app-desktop/commands/exportFolders.d.ts
+packages/app-desktop/commands/exportFolders.js
+packages/app-desktop/commands/exportFolders.js.map
+packages/app-desktop/commands/exportNotes.d.ts
+packages/app-desktop/commands/exportNotes.js
+packages/app-desktop/commands/exportNotes.js.map
 packages/app-desktop/commands/focusElement.d.ts
 packages/app-desktop/commands/focusElement.js
 packages/app-desktop/commands/focusElement.js.map
@@ -352,6 +290,9 @@ packages/app-desktop/gui/ConfigScreen/ConfigScreen.js.map
 packages/app-desktop/gui/ConfigScreen/SideBar.d.ts
 packages/app-desktop/gui/ConfigScreen/SideBar.js
 packages/app-desktop/gui/ConfigScreen/SideBar.js.map
+packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.d.ts
+packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.js
+packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
@@ -493,6 +434,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js.map
@@ -712,6 +656,9 @@ packages/app-desktop/gui/ToolbarButton/ToolbarButton.js.map
 packages/app-desktop/gui/ToolbarButton/styles/index.d.ts
 packages/app-desktop/gui/ToolbarButton/styles/index.js
 packages/app-desktop/gui/ToolbarButton/styles/index.js.map
+packages/app-desktop/gui/dialogs.d.ts
+packages/app-desktop/gui/dialogs.js
+packages/app-desktop/gui/dialogs.js.map
 packages/app-desktop/gui/hooks/useEffectDebugger.d.ts
 packages/app-desktop/gui/hooks/useEffectDebugger.js
 packages/app-desktop/gui/hooks/useEffectDebugger.js.map
@@ -724,6 +671,9 @@ packages/app-desktop/gui/hooks/usePrevious.js.map
 packages/app-desktop/gui/hooks/usePropsDebugger.d.ts
 packages/app-desktop/gui/hooks/usePropsDebugger.js
 packages/app-desktop/gui/hooks/usePropsDebugger.js.map
+packages/app-desktop/gui/lib/ToggleButton/ToggleButton.d.ts
+packages/app-desktop/gui/lib/ToggleButton/ToggleButton.js
+packages/app-desktop/gui/lib/ToggleButton/ToggleButton.js.map
 packages/app-desktop/gui/menuCommandNames.d.ts
 packages/app-desktop/gui/menuCommandNames.js
 packages/app-desktop/gui/menuCommandNames.js.map
@@ -763,12 +713,27 @@ packages/app-desktop/services/plugins/UserWebviewDialog.js.map
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.d.ts
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.js
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.js.map
+packages/app-desktop/services/plugins/hooks/useContentSize.d.ts
+packages/app-desktop/services/plugins/hooks/useContentSize.js
+packages/app-desktop/services/plugins/hooks/useContentSize.js.map
+packages/app-desktop/services/plugins/hooks/useHtmlLoader.d.ts
+packages/app-desktop/services/plugins/hooks/useHtmlLoader.js
+packages/app-desktop/services/plugins/hooks/useHtmlLoader.js.map
+packages/app-desktop/services/plugins/hooks/useScriptLoader.d.ts
+packages/app-desktop/services/plugins/hooks/useScriptLoader.js
+packages/app-desktop/services/plugins/hooks/useScriptLoader.js.map
+packages/app-desktop/services/plugins/hooks/useSubmitHandler.d.ts
+packages/app-desktop/services/plugins/hooks/useSubmitHandler.js
+packages/app-desktop/services/plugins/hooks/useSubmitHandler.js.map
 packages/app-desktop/services/plugins/hooks/useThemeCss.d.ts
 packages/app-desktop/services/plugins/hooks/useThemeCss.js
 packages/app-desktop/services/plugins/hooks/useThemeCss.js.map
 packages/app-desktop/services/plugins/hooks/useViewIsReady.d.ts
 packages/app-desktop/services/plugins/hooks/useViewIsReady.js
 packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
+packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
+packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
+packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -964,6 +929,9 @@ packages/lib/services/BaseService.js.map
 packages/lib/services/CommandService.d.ts
 packages/lib/services/CommandService.js
 packages/lib/services/CommandService.js.map
+packages/lib/services/ExternalEditWatcher.d.ts
+packages/lib/services/ExternalEditWatcher.js
+packages/lib/services/ExternalEditWatcher.js.map
 packages/lib/services/KeymapService.d.ts
 packages/lib/services/KeymapService.js
 packages/lib/services/KeymapService.js.map
@@ -1150,15 +1118,18 @@ packages/lib/services/plugins/reducer.js.map
 packages/lib/services/plugins/sandboxProxy.d.ts
 packages/lib/services/plugins/sandboxProxy.js
 packages/lib/services/plugins/sandboxProxy.js.map
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.d.ts
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.js
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
 packages/lib/services/plugins/utils/executeSandboxCall.d.ts
 packages/lib/services/plugins/utils/executeSandboxCall.js
 packages/lib/services/plugins/utils/executeSandboxCall.js.map
+packages/lib/services/plugins/utils/loadContentScripts.d.ts
+packages/lib/services/plugins/utils/loadContentScripts.js
+packages/lib/services/plugins/utils/loadContentScripts.js.map
+packages/lib/services/plugins/utils/makeListener.d.ts
+packages/lib/services/plugins/utils/makeListener.js
+packages/lib/services/plugins/utils/makeListener.js.map
 packages/lib/services/plugins/utils/manifestFromObject.d.ts
 packages/lib/services/plugins/utils/manifestFromObject.js
 packages/lib/services/plugins/utils/manifestFromObject.js.map
@@ -1297,6 +1268,9 @@ packages/lib/uuid.js.map
 packages/lib/versionInfo.d.ts
 packages/lib/versionInfo.js
 packages/lib/versionInfo.js.map
+packages/renderer/HtmlToHtml.d.ts
+packages/renderer/HtmlToHtml.js
+packages/renderer/HtmlToHtml.js.map
 packages/renderer/InMemoryCache.d.ts
 packages/renderer/InMemoryCache.js
 packages/renderer/InMemoryCache.js.map
@@ -1306,6 +1280,12 @@ packages/renderer/MarkupToHtml.js.map
 packages/renderer/MdToHtml.d.ts
 packages/renderer/MdToHtml.js
 packages/renderer/MdToHtml.js.map
+packages/renderer/MdToHtml/linkReplacement.d.ts
+packages/renderer/MdToHtml/linkReplacement.js
+packages/renderer/MdToHtml/linkReplacement.js.map
+packages/renderer/MdToHtml/linkReplacement.test.d.ts
+packages/renderer/MdToHtml/linkReplacement.test.js
+packages/renderer/MdToHtml/linkReplacement.test.js.map
 packages/renderer/MdToHtml/rules/checkbox.d.ts
 packages/renderer/MdToHtml/rules/checkbox.js
 packages/renderer/MdToHtml/rules/checkbox.js.map
@@ -1339,6 +1319,9 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
+packages/renderer/htmlUtils.d.ts
+packages/renderer/htmlUtils.js
+packages/renderer/htmlUtils.js.map
 packages/renderer/index.d.ts
 packages/renderer/index.js
 packages/renderer/index.js.map
@@ -1348,4 +1331,7 @@ packages/renderer/noteStyle.js.map
 packages/renderer/pathUtils.d.ts
 packages/renderer/pathUtils.js
 packages/renderer/pathUtils.js.map
+packages/renderer/utils.d.ts
+packages/renderer/utils.js
+packages/renderer/utils.js.map
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

.eslintrc.js

@@ -15,7 +15,8 @@ module.exports = {
 		'Atomics': 'readonly',
 		'SharedArrayBuffer': 'readonly',
 
-		// Jasmine variables
+		// Jest variables
+		'test': 'readonly',
 		'expect': 'readonly',
 		'describe': 'readonly',
 		'it': 'readonly',
@@ -23,10 +24,6 @@ module.exports = {
 		'afterAll': 'readonly',
 		'beforeEach': 'readonly',
 		'afterEach': 'readonly',
-		'jasmine': 'readonly',
-
-		// Jest variables
-		'test': 'readonly',
 
 		// React Native variables
 		'__DEV__': 'readonly',
@@ -129,6 +126,10 @@ module.exports = {
 		{
 			// enable the rule specifically for TypeScript files
 			'files': ['*.ts', '*.tsx'],
+			'parserOptions': {
+				// Required for @typescript-eslint/no-floating-promises
+				'project': './tsconfig.eslint.json',
+			},
 			'rules': {
 				// Warn only because it would make it difficult to convert JS classes to TypeScript, unless we
 				// make everything public which is not great. New code however should specify member accessibility.
@@ -155,6 +156,7 @@ module.exports = {
 						'requireLast': false,
 					},
 				}],
+				'@typescript-eslint/no-floating-promises': ['error'],
 			},
 		},
 	],

.gitignore

@@ -50,105 +50,15 @@ packages/tools/github_oauth_token.txt
 lerna-debug.log
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.js
-Assets/TinyMCE/JoplinLists/src/main/ts/Main.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.js
-Assets/TinyMCE/JoplinLists/src/main/ts/Plugin.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/Indendation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/actions/ToggleList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Api.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Commands.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Events.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.js
-Assets/TinyMCE/JoplinLists/src/main/ts/api/Settings.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Bookmark.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Delete.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/DlIndentation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Keyboard.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/ListAction.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NodeType.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/NormalizeLists.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Range.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Selection.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/SplitList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/TextBlock.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.js
-Assets/TinyMCE/JoplinLists/src/main/ts/core/Util.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ComposeList.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Entry.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Indentation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/JoplinListUtil.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ListsIndendation.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/NormalizeEntries.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/ParseLists.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.js
-Assets/TinyMCE/JoplinLists/src/main/ts/listModel/Util.js.map
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.d.ts
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.js
-Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.js.map
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/LinkSelector.js.map
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
-packages/app-cli/build/LinkSelector.d.ts
-packages/app-cli/build/LinkSelector.js
-packages/app-cli/build/LinkSelector.js.map
-packages/app-cli/build/services/plugins/PluginRunner.d.ts
-packages/app-cli/build/services/plugins/PluginRunner.js
-packages/app-cli/build/services/plugins/PluginRunner.js.map
+packages/app-cli/tests/EnexToMd.d.ts
+packages/app-cli/tests/EnexToMd.js
+packages/app-cli/tests/EnexToMd.js.map
 packages/app-cli/tests/InMemoryCache.d.ts
 packages/app-cli/tests/InMemoryCache.js
 packages/app-cli/tests/InMemoryCache.js.map
@@ -167,6 +77,9 @@ packages/app-cli/tests/models_Note.js.map
 packages/app-cli/tests/models_Setting.d.ts
 packages/app-cli/tests/models_Setting.js
 packages/app-cli/tests/models_Setting.js.map
+packages/app-cli/tests/services/plugins/api/JoplinWorkspace.d.ts
+packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js
+packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js.map
 packages/app-cli/tests/services/plugins/sandboxProxy.d.ts
 packages/app-cli/tests/services/plugins/sandboxProxy.js
 packages/app-cli/tests/services/plugins/sandboxProxy.js.map
@@ -188,6 +101,15 @@ packages/app-cli/tests/services_keychainService.js.map
 packages/app-cli/tests/services_rest_Api.d.ts
 packages/app-cli/tests/services_rest_Api.js
 packages/app-cli/tests/services_rest_Api.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js.map
 packages/app-cli/tests/support/plugins/content_script/api/index.d.ts
 packages/app-cli/tests/support/plugins/content_script/api/index.js
 packages/app-cli/tests/support/plugins/content_script/api/index.js.map
@@ -224,6 +146,15 @@ packages/app-cli/tests/support/plugins/events/api/types.js.map
 packages/app-cli/tests/support/plugins/events/src/index.d.ts
 packages/app-cli/tests/support/plugins/events/src/index.js
 packages/app-cli/tests/support/plugins/events/src/index.js.map
+packages/app-cli/tests/support/plugins/jpl_test/api/index.d.ts
+packages/app-cli/tests/support/plugins/jpl_test/api/index.js
+packages/app-cli/tests/support/plugins/jpl_test/api/index.js.map
+packages/app-cli/tests/support/plugins/jpl_test/api/types.d.ts
+packages/app-cli/tests/support/plugins/jpl_test/api/types.js
+packages/app-cli/tests/support/plugins/jpl_test/api/types.js.map
+packages/app-cli/tests/support/plugins/jpl_test/src/index.d.ts
+packages/app-cli/tests/support/plugins/jpl_test/src/index.js
+packages/app-cli/tests/support/plugins/jpl_test/src/index.js.map
 packages/app-cli/tests/support/plugins/json_export/api/index.d.ts
 packages/app-cli/tests/support/plugins/json_export/api/index.js
 packages/app-cli/tests/support/plugins/json_export/api/index.js.map
@@ -317,6 +248,12 @@ packages/app-desktop/bridge.js.map
 packages/app-desktop/commands/copyDevCommand.d.ts
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyDevCommand.js.map
+packages/app-desktop/commands/exportFolders.d.ts
+packages/app-desktop/commands/exportFolders.js
+packages/app-desktop/commands/exportFolders.js.map
+packages/app-desktop/commands/exportNotes.d.ts
+packages/app-desktop/commands/exportNotes.js
+packages/app-desktop/commands/exportNotes.js.map
 packages/app-desktop/commands/focusElement.d.ts
 packages/app-desktop/commands/focusElement.js
 packages/app-desktop/commands/focusElement.js.map
@@ -344,6 +281,9 @@ packages/app-desktop/gui/ConfigScreen/ConfigScreen.js.map
 packages/app-desktop/gui/ConfigScreen/SideBar.d.ts
 packages/app-desktop/gui/ConfigScreen/SideBar.js
 packages/app-desktop/gui/ConfigScreen/SideBar.js.map
+packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.d.ts
+packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.js
+packages/app-desktop/gui/ConfigScreen/controls/PluginsStates.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
@@ -485,6 +425,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js.map
@@ -704,6 +647,9 @@ packages/app-desktop/gui/ToolbarButton/ToolbarButton.js.map
 packages/app-desktop/gui/ToolbarButton/styles/index.d.ts
 packages/app-desktop/gui/ToolbarButton/styles/index.js
 packages/app-desktop/gui/ToolbarButton/styles/index.js.map
+packages/app-desktop/gui/dialogs.d.ts
+packages/app-desktop/gui/dialogs.js
+packages/app-desktop/gui/dialogs.js.map
 packages/app-desktop/gui/hooks/useEffectDebugger.d.ts
 packages/app-desktop/gui/hooks/useEffectDebugger.js
 packages/app-desktop/gui/hooks/useEffectDebugger.js.map
@@ -716,6 +662,9 @@ packages/app-desktop/gui/hooks/usePrevious.js.map
 packages/app-desktop/gui/hooks/usePropsDebugger.d.ts
 packages/app-desktop/gui/hooks/usePropsDebugger.js
 packages/app-desktop/gui/hooks/usePropsDebugger.js.map
+packages/app-desktop/gui/lib/ToggleButton/ToggleButton.d.ts
+packages/app-desktop/gui/lib/ToggleButton/ToggleButton.js
+packages/app-desktop/gui/lib/ToggleButton/ToggleButton.js.map
 packages/app-desktop/gui/menuCommandNames.d.ts
 packages/app-desktop/gui/menuCommandNames.js
 packages/app-desktop/gui/menuCommandNames.js.map
@@ -755,12 +704,27 @@ packages/app-desktop/services/plugins/UserWebviewDialog.js.map
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.d.ts
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.js
 packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.js.map
+packages/app-desktop/services/plugins/hooks/useContentSize.d.ts
+packages/app-desktop/services/plugins/hooks/useContentSize.js
+packages/app-desktop/services/plugins/hooks/useContentSize.js.map
+packages/app-desktop/services/plugins/hooks/useHtmlLoader.d.ts
+packages/app-desktop/services/plugins/hooks/useHtmlLoader.js
+packages/app-desktop/services/plugins/hooks/useHtmlLoader.js.map
+packages/app-desktop/services/plugins/hooks/useScriptLoader.d.ts
+packages/app-desktop/services/plugins/hooks/useScriptLoader.js
+packages/app-desktop/services/plugins/hooks/useScriptLoader.js.map
+packages/app-desktop/services/plugins/hooks/useSubmitHandler.d.ts
+packages/app-desktop/services/plugins/hooks/useSubmitHandler.js
+packages/app-desktop/services/plugins/hooks/useSubmitHandler.js.map
 packages/app-desktop/services/plugins/hooks/useThemeCss.d.ts
 packages/app-desktop/services/plugins/hooks/useThemeCss.js
 packages/app-desktop/services/plugins/hooks/useThemeCss.js.map
 packages/app-desktop/services/plugins/hooks/useViewIsReady.d.ts
 packages/app-desktop/services/plugins/hooks/useViewIsReady.js
 packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
+packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
+packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
+packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -956,6 +920,9 @@ packages/lib/services/BaseService.js.map
 packages/lib/services/CommandService.d.ts
 packages/lib/services/CommandService.js
 packages/lib/services/CommandService.js.map
+packages/lib/services/ExternalEditWatcher.d.ts
+packages/lib/services/ExternalEditWatcher.js
+packages/lib/services/ExternalEditWatcher.js.map
 packages/lib/services/KeymapService.d.ts
 packages/lib/services/KeymapService.js
 packages/lib/services/KeymapService.js.map
@@ -1142,15 +1109,18 @@ packages/lib/services/plugins/reducer.js.map
 packages/lib/services/plugins/sandboxProxy.d.ts
 packages/lib/services/plugins/sandboxProxy.js
 packages/lib/services/plugins/sandboxProxy.js.map
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.d.ts
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.js
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
 packages/lib/services/plugins/utils/executeSandboxCall.d.ts
 packages/lib/services/plugins/utils/executeSandboxCall.js
 packages/lib/services/plugins/utils/executeSandboxCall.js.map
+packages/lib/services/plugins/utils/loadContentScripts.d.ts
+packages/lib/services/plugins/utils/loadContentScripts.js
+packages/lib/services/plugins/utils/loadContentScripts.js.map
+packages/lib/services/plugins/utils/makeListener.d.ts
+packages/lib/services/plugins/utils/makeListener.js
+packages/lib/services/plugins/utils/makeListener.js.map
 packages/lib/services/plugins/utils/manifestFromObject.d.ts
 packages/lib/services/plugins/utils/manifestFromObject.js
 packages/lib/services/plugins/utils/manifestFromObject.js.map
@@ -1289,6 +1259,9 @@ packages/lib/uuid.js.map
 packages/lib/versionInfo.d.ts
 packages/lib/versionInfo.js
 packages/lib/versionInfo.js.map
+packages/renderer/HtmlToHtml.d.ts
+packages/renderer/HtmlToHtml.js
+packages/renderer/HtmlToHtml.js.map
 packages/renderer/InMemoryCache.d.ts
 packages/renderer/InMemoryCache.js
 packages/renderer/InMemoryCache.js.map
@@ -1298,6 +1271,12 @@ packages/renderer/MarkupToHtml.js.map
 packages/renderer/MdToHtml.d.ts
 packages/renderer/MdToHtml.js
 packages/renderer/MdToHtml.js.map
+packages/renderer/MdToHtml/linkReplacement.d.ts
+packages/renderer/MdToHtml/linkReplacement.js
+packages/renderer/MdToHtml/linkReplacement.js.map
+packages/renderer/MdToHtml/linkReplacement.test.d.ts
+packages/renderer/MdToHtml/linkReplacement.test.js
+packages/renderer/MdToHtml/linkReplacement.test.js.map
 packages/renderer/MdToHtml/rules/checkbox.d.ts
 packages/renderer/MdToHtml/rules/checkbox.js
 packages/renderer/MdToHtml/rules/checkbox.js.map
@@ -1331,6 +1310,9 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
+packages/renderer/htmlUtils.d.ts
+packages/renderer/htmlUtils.js
+packages/renderer/htmlUtils.js.map
 packages/renderer/index.d.ts
 packages/renderer/index.js
 packages/renderer/index.js.map
@@ -1340,4 +1322,7 @@ packages/renderer/noteStyle.js.map
 packages/renderer/pathUtils.d.ts
 packages/renderer/pathUtils.js
 packages/renderer/pathUtils.js.map
+packages/renderer/utils.d.ts
+packages/renderer/utils.js
+packages/renderer/utils.js.map
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

.travis.yml

@@ -1,5 +1,5 @@
 # Only build tags (Doesn't work - doesn't build anything)
-if: tag IS present OR type = pull_request
+if: tag IS present OR type = pull_request OR branch = dev
 
 rvm: 2.3.3
 
@@ -15,21 +15,30 @@ branches:
 matrix:
   include:
     - os: osx
-      osx_image: xcode9.0
+      osx_image: xcode12
       language: node_js
-      node_js: "10"
-      env:
-        - ELECTRON_CACHE=$HOME/.cache/electron
-        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+      node_js: "12"
+      cache:
+        npm: false
+      # Cache was disabled because when changing from node_js 10 to node_js 12
+      # it was still using build files from Node 10 when building SQLite which
+      # was making it fail. Might be ok to re-enable later on, although it doesn't
+      # make build that much faster.
+      #
+      # env:
+      #   - ELECTRON_CACHE=$HOME/.cache/electron
+      #   - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
     - os: linux
       sudo: required
       dist: trusty
       language: node_js
-      node_js: "10"
-      env:
-        - ELECTRON_CACHE=$HOME/.cache/electron
-        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+      node_js: "12"
+      cache:
+        npm: false
+      # env:
+      #   - ELECTRON_CACHE=$HOME/.cache/electron
+      #   - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
 # cache:
 #   directories:
@@ -65,7 +74,7 @@ script:
     # Run test units.
     # Only do it for pull requests because Travis randomly fails to run them
     # and that would break the desktop release.
-    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$TRAVIS_BRANCH" = "dev" ]; then
       npm run test-ci
       testResult=$?
       if [ $testResult -ne 0 ]; then

BUILD.md

@@ -91,7 +91,7 @@ Note that you should most likely always specify a scope because otherwise it wil
 
 ## TypeScript
 
-The application was originally written JavaScript, however it has slowly been migrated to [TypeScript](https://www.typescriptlang.org/). New classes and files should be written in TypeScript. All compiled files are generated next to the .ts or .tsx file. So for example, if there's a file "lib/MyClass.ts", there will be a generated "lib/MyClass.js" next to it. It is implemented that way as it requires minimal changes to integrate TypeScript in the existing JavaScript code base.
+The application was originally written in JavaScript, however it has slowly been migrated to [TypeScript](https://www.typescriptlang.org/). New classes and files should be written in TypeScript. All compiled files are generated next to the .ts or .tsx file. So for example, if there's a file "lib/MyClass.ts", there will be a generated "lib/MyClass.js" next to it. It is implemented that way as it requires minimal changes to integrate TypeScript in the existing JavaScript code base.
 
 ## Hot reload
 

Joplin_install_and_update.sh

@@ -162,7 +162,7 @@ DESKTOP=${DESKTOP,,}  # convert to lower case
 
 #-----------------------------------------------------
 echo 'Create Desktop icon...'
-if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.* ]]
+if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.*|.*i3.* ]]
 then
     : "${TMPDIR:=$TEMP_DIR}"
     # This command extracts to squashfs-root by default and can't be changed...

README.md

@@ -20,15 +20,15 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
 
 Operating System | Download | Alternative
 -----------------|--------|-------------------
-Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.3.18/Joplin-Setup-1.3.18.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.3.18/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
-macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.3.18/Joplin-1.3.18.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew (unsupported): `brew cask install joplin`
-Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.3.18/Joplin-1.3.18.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package (unsupported) [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, and Mint; the desktop environments supported are GNOME, KDE, Xfce, MATE, LXQT, LXDE, Unity, Cinnamon, Deepin and Pantheon), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh \| bash`
+Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.4.18/Joplin-Setup-1.4.18.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.4.18/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
+macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.4.18/Joplin-1.4.18.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew (unsupported): `brew cask install joplin`
+Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.4.18/Joplin-1.4.18.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package (unsupported) [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, and Mint; the desktop environments supported are GNOME, KDE, Xfce, MATE, LXQT, LXDE, Unity, Cinnamon, Deepin and Pantheon), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh \| bash`
 
 ## Mobile applications
 
 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.13/joplin-v1.3.13.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.3.13/joplin-v1.3.13-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.4.11/joplin-v1.4.11.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v1.4.11/joplin-v1.4.11-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
@@ -64,7 +64,8 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 | :---: | :---: | :---: |
 | <img width="50" src="https://avatars0.githubusercontent.com/u/6979755?s=96&v=4"/></br>[Devon Zuegel](https://github.com/devonzuegel) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[小西　孝宗](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[Alexander van der Berg](https://github.com/avanderberg)
 | <img width="50" src="https://avatars0.githubusercontent.com/u/1168659?s=96&v=4"/></br>[Nicholas Head](https://github.com/nicholashead) | <img width="50" src="https://avatars2.githubusercontent.com/u/1439535?s=96&v=4"/></br>[Frank Bloise](https://github.com/fbloise) | <img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br>[Thomas Broussard](https://github.com/thomasbroussard)
-| <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[Brandon Johnson](https://github.com/dbrandonjohnson) | <img width="50" src="https://avatars1.githubusercontent.com/u/3061769?s=96&v=4"/></br>[@cnagy](https://github.com/c-nagy) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[Brandon Johnson](https://github.com/dbrandonjohnson) | <img width="50" src="https://avatars1.githubusercontent.com/u/3061769?s=96&v=4"/></br>[@cnagy](https://github.com/c-nagy) | <img width="50" src="https://avatars3.githubusercontent.com/u/53228972?s=96&v=4"/></br>[clmntsl](https://github.com/clmntsl)
+| <img width="50" src="https://avatars1.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp)
 
 <!-- TOC -->
 # Table of contents
@@ -85,14 +86,19 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 	- [How to enable debug mode](https://github.com/laurent22/joplin/blob/dev/readme/debugging.md)
 	- [FAQ](https://github.com/laurent22/joplin/blob/dev/readme/faq.md)
 
-- Joplin API
+- Joplin API - Get Started
 
 	- [Joplin API Overview](https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md)
 	- [Plugin development](https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md)
 	- [Plugin tutorial](https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md)
-	- [Plugin manifest](https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manifest.md)
+	
+
+- Joplin API - References
+
 	- [Plugin API](https://joplinapp.org/api/references/plugin_api/classes/joplin.html)
-	- [Data API documentation](https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md)
+	- [Data API](https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md)
+	- [Plugin manifest](https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manifest.md)
+	- [Plugin loading rules](https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loading_rules.md)
 
 - Development
 
@@ -397,13 +403,14 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 
 # Community
 
-- For general discussion about Joplin, user support, software development questions, and to discuss new features, go to the [Joplin Forum](https://discourse.joplinapp.org/). It is possible to login with your GitHub account.
-- Also see here for information about [the latest releases and general news](https://discourse.joplinapp.org/c/news).
-- For bug reports go to the [GitHub Issue Tracker](https://github.com/laurent22/joplin/issues). Please follow the template accordingly.
-- Feature requests must not be opened on GitHub unless they have been discussed and accepted on the forum.
-- The latest news are posted [on the Patreon page](https://www.patreon.com/joplin).
-- You can also follow us on <a rel="me" href="https://mastodon.social/@joplinapp">the Mastodon feed</a> or [the Twitter feed](https://twitter.com/joplinapp).
-- You can join the live community on [the JoplinApp discord server](https://discordapp.com/invite/d2HMPwE) to get help with Joplin or to discuss anything Joplin related.
+Name | Description
+--- | ---
+[Support Forum](https://discourse.joplinapp.org/) | This is the main place for general discussion about Joplin, user support, software development questions, and to discuss new features. Also where the latest beta versions are released and discussed.
+[Sub-reddit](https://www.reddit.com/r/joplinapp/) | Also a good place to get help
+[Discord server](https://discordapp.com/invite/d2HMPwE) | Our chat server
+[Patreon page](https://www.patreon.com/joplin) |The latest news are often posted there
+[Mastodon feed](https://mastodon.social/@joplinapp) | Follow us on Mastodon
+[Twitter feed](https://twitter.com/joplinapp) | Follow us on Twitter
 
 # Contributing
 

docs/api/get_started/plugins/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/api/overview/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>
@@ -395,12 +401,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <h1>Extending Joplin<a name="extending-joplin" href="#extending-joplin" class="heading-anchor">🔗</a></h1>
 <p>Joplin provides a number of extension points to allow third-party applications to access its data, or to develop plugins.</p>
 <p>The two main extension points are:</p>
-<ul>
-<li>
-<p>The <a href="https://joplinapp.org/api/references/rest_api/">data API</a>, which is a server that provides access to Joplin data to external applications. It is possible, using standard HTTP calls, to create, modify or delete notes, notebooks, tags, etc. as well as attach files to notes and retrieve these files. This is for example how the web clipper communicates with Joplin.</p>
-</li>
-<li>
-<p>The <a href="https://joplinapp.org/api/get_started/plugins/">plugin API</a>, which allows directly modifying Joplin by adding new features to the application. Using this API, you can:</p>
+<h2>Data API<a name="data-api" href="#data-api" class="heading-anchor">🔗</a></h2>
+<p>The <a href="https://joplinapp.org/api/references/rest_api/">data API</a> provides access to Joplin data to external applications. It is possible, using standard HTTP calls, to create, modify or delete notes, notebooks, tags, etc. as well as attach files to notes and retrieve these files.</p>
+<p>This is for example how the web clipper communicates with Joplin, and this is most likely what you will need if you have an external application that needs access to Joplin data.</p>
+<p>To get started with the data API, <a href="https://joplinapp.org/api/references/rest_api/">check the documentation</a>.</p>
+<h2>Plugin API<a name="plugin-api" href="#plugin-api" class="heading-anchor">🔗</a></h2>
+<p>With plugins you can directly modify Joplin by adding new features to the application. Using this API, you can:</p>
 <ul>
 <li>Access notes, folders, etc. via the data API</li>
 <li>Add a view to display custom data using HTML/CSS/JS</li>
@@ -411,9 +417,11 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <li>Hook into the application to set additional options and customise Joplin's behaviour</li>
 <li>Create a module to export or import data into Joplin</li>
 <li>Define new settings and setting sections, and get/set them from the plugin</li>
+<li>Create a new Markdown plugin to render custom markup.</li>
+<li>Create an editor plugin to modify, at a low-level, the behaviour of the Markdown editor (CodeMirror)</li>
 </ul>
-</li>
-</ul>
+<p>To get started with the plugin API, check the <a href="https://joplinapp.org/api/get_started/plugins/">Get Started</a> page or have a look at the <a href="https://joplinapp.org/api/tutorials/toc_plugin/">TOC tutorial</a>.</p>
+<p>Once you are familiar with the API, you can have a look at the <a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">plugin API reference</a> for a detailed documentation about each supported feature.</p>
 
 		<div class="bottom-links">
 			<a href="https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md">

docs/api/references/development_mode/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/api/references/plugin_api/classes/joplinplugins.html

@@ -155,7 +155,8 @@
 								</div>
 								<p>Note that registering a content script in itself will do nothing - it will only be loaded in specific cases by the relevant app modules
 								(eg. the Markdown renderer or the code editor). So it is not a way to inject and run arbitrary code in the app, which for safety and performance reasons is not supported.</p>
-								<p><a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/content_script">View the demo plugin</a></p>
+								<p><a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/content_script">View the renderer demo plugin</a>
+								<a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/codemirror_content_script">View the editor demo plugin</a></p>
 							</div>
 							<h4 class="tsd-parameters-title">Parameters</h4>
 							<ul class="tsd-parameters">

docs/api/references/plugin_api/classes/joplinviewsdialogs.html

@@ -67,12 +67,33 @@
 			<section class="tsd-panel tsd-comment">
 				<div class="tsd-comment tsd-typography">
 					<div class="lead">
-						<p>Allows creating and managing dialogs. A dialog is modal window that contains a webview and a row of buttons. You can update the update the webview using the <code>setHtml</code> method.
-							Dialogs are hidden by default and you need to call <code>open()</code> to open them. Once the user clicks on a button, the <code>open</code> call will return an object indicating what button was clicked
-							on. If your HTML content included one or more form, a <code>formData</code> object will also be included with the key/value for each form.
-						There is currently no &quot;close&quot; method since the dialog should be thought as a modal one and thus can only be closed by clicking on one of the buttons.</p>
+						<p>Allows creating and managing dialogs. A dialog is modal window that
+							contains a webview and a row of buttons. You can update the update the
+							webview using the <code>setHtml</code> method. Dialogs are hidden by default and
+							you need to call <code>open()</code> to open them. Once the user clicks on a
+							button, the <code>open</code> call will return an object indicating what button was
+						clicked on.</p>
 					</div>
-					<p><a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/dialog">View the demo plugin</a></p>
+					<a href="#retrieving-form-values" id="retrieving-form-values" style="color: inherit; text-decoration: none;">
+						<h2>Retrieving form values</h2>
+					</a>
+					<p>If your HTML content included one or more forms, a <code>formData</code> object
+					will also be included with the key/value for each form.</p>
+					<a href="#special-button-ids" id="special-button-ids" style="color: inherit; text-decoration: none;">
+						<h2>Special button IDs</h2>
+					</a>
+					<p>The following buttons IDs have a special meaning:</p>
+					<ul>
+						<li><code>ok</code>, <code>yes</code>, <code>submit</code>, <code>confirm</code>: They are considered &quot;submit&quot; buttons</li>
+						<li><code>cancel</code>, <code>no</code>, <code>reject</code>: They are considered &quot;dismiss&quot; buttons</li>
+					</ul>
+					<p>This information is used by the application to determine what action
+						should be done when the user presses &quot;Enter&quot; or &quot;Escape&quot; within the
+						dialog. If they press &quot;Enter&quot;, the first &quot;submit&quot; button will be
+						automatically clicked. If they press &quot;Escape&quot; the first &quot;dismiss&quot; button
+					will be automatically clicked.</p>
+					<p><a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/dialog">View the demo
+					plugin</a></p>
 				</div>
 			</section>
 			<!--

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

@@ -86,6 +86,41 @@
 					<div class="tsd-signature tsd-kind-icon">Code<wbr>Mirror<wbr>Plugin<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol"> = &quot;codeMirrorPlugin&quot;</span></div>
 					<aside class="tsd-sources">
 					</aside>
+					<div class="tsd-comment tsd-typography">
+						<div class="lead">
+							<p>Registers a new CodeMirror plugin, which should follow the template below.</p>
+						</div>
+						<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> {
+            <span class="hljs-attr">plugin</span>: <span class="hljs-function"><span class="hljs-keyword">function</span>(<span class="hljs-params">CodeMirror</span>) </span>{
+                <span class="hljs-comment">// ...</span>
+            },
+            <span class="hljs-attr">codeMirrorResources</span>: [],
+            <span class="hljs-attr">codeMirrorOptions</span>: {
+                                    <span class="hljs-comment">// ...</span>
+                         },
+            <span class="hljs-attr">assets</span>: {
+                <span class="hljs-comment">// ...</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 <code>plugin</code> key is your CodeMirror plugin. This is where you can register new commands with CodeMirror or interact with the CodeMirror instance as needed.</p>
+							</li>
+							<li><p>The <code>codeMirrorResources</code> key is an array of CodeMirror resources that will be loaded and attached to the CodeMirror module. These are made up of addons, keymaps, and modes. For example, for a plugin that want&#39;s to enable clojure highlighting in code blocks. <code>codeMirrorResources</code> would be set to <code>[&#39;mode/clojure/clojure&#39;]</code>.</p>
+							</li>
+							<li><p>The <code>codeMirrorOptions</code> key contains all the <a href="https://codemirror.net/doc/manual.html#config">CodeMirror</a> options that will be set or changed by this plugin. New options can alse be declared via <a href="https://codemirror.net/doc/manual.html#defineOption"><code>CodeMirror.defineOption</code></a>, and then have their value set here. For example, a plugin that enables line numbers would set <code>codeMirrorOptions</code> to <code>{&#39;lineNumbers&#39;: true}</code>.</p>
+							</li>
+							<li><p>Using the <strong>optional</strong> <code>assets</code> key you may specify <strong>only</strong> CSS assets that should be loaded in the rendered HTML document. Check for example the Joplin <a href="https://github.com/laurent22/joplin/blob/dev/packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/mermaid.ts">Mermaid plugin</a> to see how the data should be structured.</p>
+							</li>
+						</ul>
+						<p>One of the <code>plugin</code>, <code>codeMirrorResources</code>, or <code>codeMirrorOptions</code> keys must be provided for the plugin to be valid. Having multiple or all provided is also okay.</p>
+						<p>See the <a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/codemirror_content_script">demo plugin</a> for an example of all these keys being used in one plugin.</p>
+					</div>
 				</section>
 				<section class="tsd-panel tsd-member tsd-kind-enum-member tsd-parent-kind-enum">
 					<a name="markdownitplugin" class="tsd-anchor"></a>

docs/api/references/plugin_api/globals.html

@@ -121,6 +121,12 @@
 								<li class="tsd-kind-type-alias"><a href="globals.html#viewhandle" class="tsd-kind-icon">View<wbr>Handle</a></li>
 							</ul>
 						</section>
+						<section class="tsd-index-section ">
+							<h3>Variables</h3>
+							<ul class="tsd-index-list">
+								<li class="tsd-kind-variable"><a href="globals.html#logger" class="tsd-kind-icon">logger</a></li>
+							</ul>
+						</section>
 					</div>
 				</section>
 			</section>
@@ -156,6 +162,16 @@
 					</aside>
 				</section>
 			</section>
+			<section class="tsd-panel-group tsd-member-group ">
+				<h2>Variables</h2>
+				<section class="tsd-panel tsd-member tsd-kind-variable">
+					<a name="logger" class="tsd-anchor"></a>
+					<h3><span class="tsd-flag ts-flagConst">Const</span> logger</h3>
+					<div class="tsd-signature tsd-kind-icon">logger<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">LoggerWrapper</span><span class="tsd-signature-symbol"> = Logger.create(&#x27;joplin.plugins&#x27;)</span></div>
+					<aside class="tsd-sources">
+					</aside>
+				</section>
+			</section>
 		</div>
 		<div class="col-4 col-menu menu-sticky-wrap menu-highlight">
 			<!--

docs/api/references/plugin_api/interfaces/exportoptions.html

@@ -84,7 +84,6 @@
 							<h3>Properties</h3>
 							<ul class="tsd-index-list">
 								<li class="tsd-kind-property tsd-parent-kind-interface"><a href="exportoptions.html#format" class="tsd-kind-icon">format</a></li>
-								<li class="tsd-kind-property tsd-parent-kind-interface"><a href="exportoptions.html#modulepath" class="tsd-kind-icon">module<wbr>Path</a></li>
 								<li class="tsd-kind-property tsd-parent-kind-interface"><a href="exportoptions.html#path" class="tsd-kind-icon">path</a></li>
 								<li class="tsd-kind-property tsd-parent-kind-interface"><a href="exportoptions.html#sourcefolderids" class="tsd-kind-icon">source<wbr>Folder<wbr>Ids</a></li>
 								<li class="tsd-kind-property tsd-parent-kind-interface"><a href="exportoptions.html#sourcenoteids" class="tsd-kind-icon">source<wbr>Note<wbr>Ids</a></li>
@@ -103,13 +102,6 @@
 					<aside class="tsd-sources">
 					</aside>
 				</section>
-				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
-					<a name="modulepath" class="tsd-anchor"></a>
-					<h3><span class="tsd-flag ts-flagOptional">Optional</span> module<wbr>Path</h3>
-					<div class="tsd-signature tsd-kind-icon">module<wbr>Path<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
-					<aside class="tsd-sources">
-					</aside>
-				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="path" class="tsd-anchor"></a>
 					<h3><span class="tsd-flag ts-flagOptional">Optional</span> path</h3>
@@ -238,9 +230,6 @@
 							<li class=" tsd-kind-property tsd-parent-kind-interface">
 								<a href="exportoptions.html#format" class="tsd-kind-icon">format</a>
 							</li>
-							<li class=" tsd-kind-property tsd-parent-kind-interface">
-								<a href="exportoptions.html#modulepath" class="tsd-kind-icon">module<wbr>Path</a>
-							</li>
 							<li class=" tsd-kind-property tsd-parent-kind-interface">
 								<a href="exportoptions.html#path" class="tsd-kind-icon">path</a>
 							</li>

docs/api/references/plugin_loading_rules/index.html

@@ -0,0 +1,452 @@
+<!doctype html>
+<html>
+
+<!--
+
+!!! WARNING !!!
+
+This file was auto-generated from readme/api/references/plugin_loading_rules.md and any manual change
+made to it will be overwritten. To make a change to this file please modify
+the source Markdown file:
+
+https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loading_rules.md
+
+-->
+
+<head>
+	<title>Plugin Loading Rules | Joplin</title>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
+	<link rel="shortcut icon" type="image/x-icon" href="https://joplinapp.org/favicon.ico">
+	<!-- <link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css">  -->
+	<link rel="stylesheet" href="https://joplinapp.org/css/fork-awesome.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
+	<style>
+	body {
+		background-color: #F1F1F1;
+		color: #333333;
+	}
+
+	.root {
+		overflow: hidden;
+	}
+
+	a[href^="mailto:"] {
+		word-break: break-all;
+	}
+
+	table {
+		margin-bottom: 1em;
+	}
+	td, th {
+		padding: .8em;
+		border: 1px solid #ccc;
+	}
+
+	.page-markdown table pre,
+	.page-markdown table blockquote {
+		margin-bottom: 0;
+	}
+
+	.page-markdown table pre,
+	.page-markdown table blockquote {
+		margin-bottom: 0;
+	}
+
+	.page-markdown table pre {
+		background-color: rgba(0,0,0,0);
+		border: none;
+		margin: 0;
+		padding: 0;
+	}
+
+	h1, h2 {
+		border-bottom: 1px solid #eaecef;
+		padding-bottom: 0.3em;
+		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+		font-weight: 600;
+		font-size: 2em;
+		margin-bottom: 16px;
+	}
+	h2 {
+		font-size: 1.6em;
+	}
+	h3 {
+		font-size: 1.3em;
+	}
+	code {
+		color: black;
+		background-color: #eee;
+		border: 1px solid #ccc;
+		font-size: .85em;
+		word-break: break-all;
+	}
+	pre code {
+		border: none;
+	}
+	pre {
+		font-size: .85em;
+	}
+	blockquote {
+		font-size: 1em;
+		color: #555;
+	};
+	#toc ul {
+		margin-bottom: 10px;
+	}
+	#toc > ul > li {
+		margin-bottom: 10px;
+	}
+	#toc {
+		padding-bottom: 1em;
+	}
+	.title {
+		display: flex;
+		align-items: center;
+	}
+	.title-icon {
+		display: flex;
+		height: 1em;
+	}
+	.title-text {
+		display: flex;
+		font-weight: normal;
+		margin-bottom: .2em;
+		margin-left: .5em;
+	}
+	.sub-title {
+		font-weight: normal;
+	}
+	.container {
+		background-color: white;
+		padding: 0;
+		box-shadow: 0 10px 20px #888888;
+	}
+	table.screenshots {
+		margin-top: 2em;
+		margin-bottom: 2em;
+	}
+	table.screenshots th {
+		height: 3em;
+		text-align: center;
+	}
+	table.screenshots th, 
+	table.screenshots td {
+		border: 1px solid #C2C2C2;
+	}
+	img[align="left"] {
+		margin-right: 10px;
+		margin-bottom: 10px;
+	}
+	.mobile-screenshot {
+		height: 40em;
+		padding: 1em;
+	}
+	.cli-screenshot-wrapper {
+		background-color: black;
+		vertical-align: top;
+		padding: 1em 2em 1em 1em;
+	}
+	.cli-screenshot {
+		font-family: "Monaco", "Inconsolata", "CONSOLAS", "Deja Vu Sans Mono", "Droid Sans Mono", "Andale Mono", monospace;
+		background-color: black;
+		color: white;
+		border: none;
+	}
+	.cli-screenshot .prompt {
+		color: #48C2F0;
+	}
+	.top-screenshot {
+		margin-top: 2em;
+		text-align: center;
+	}
+	.header {
+		position: relative;
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-top: 1em;
+		padding-bottom: 1em;
+		color: white;
+		background-color: #2B2B3D;
+	}
+	.header a h1 {
+		color: white;
+	}
+	.header a:hover {
+		text-decoration: none;
+	}
+	.content {
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-bottom: 2em;
+		padding-top: 2em;
+	}
+	.forkme {
+		position: absolute;
+		right: 0;
+		top:0;
+	}
+	.nav-wrapper {
+		position: relative;
+		width: inherit;
+	}
+	.nav {
+		background-color: black;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.nav.sticky {
+		position:fixed;
+		top: 0;
+		width: inherit;
+		box-shadow: 0 0 10px #000000;
+	}
+	.nav a {
+		color: white;
+		display: inline-block;
+		padding: .6em .9em .6em .9em;
+	}
+	.nav ul {
+		padding-left: 2em;
+		margin-bottom: 0;
+		display: table-cell;
+		display: flex;
+		width: 100%;
+	}
+	.nav ul li {
+		display: inline-block;
+		padding: 0;
+	}
+	.nav li.selected {
+		background-color: #222;
+		font-weight: bold;
+	}
+	.nav-right {
+		display: flex;
+		text-align: right;
+		vertical-align: middle;
+		line-height: 0;
+		margin-right: 10px;
+	}
+	.nav-right .share-btn {
+		display: none;
+	}
+	.nav-right .small-share-btn {
+		display: none;
+	}
+	.footer {
+		padding: 2em;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 2em;
+		color: gray;
+		font-size: .9em;
+	}
+	a.heading-anchor {
+		display: inline-block;
+		opacity: 0;
+		width: 1.3em;
+		font-size: 0.7em;
+		margin-left: 0.4em;
+		line-height: 1em;
+		text-decoration: none;
+		transition: opacity 0.3s;
+	}
+	a.heading-anchor:hover,
+	h1:hover a.heading-anchor,
+	h2:hover a.heading-anchor,
+	h3:hover a.heading-anchor,
+	h4:hover a.heading-anchor,
+	h5:hover a.heading-anchor,
+	h6:hover a.heading-anchor {
+		opacity: 1;
+	}
+
+	@media (min-width: 992px) {
+		.content{
+			display: flex;
+		}
+
+		#toc{
+			display: block!important;
+			align-self: flex-start;
+			width: 300px;
+			position: sticky; top: 20px; left: 0;            
+		}
+
+		.main{
+			width: calc(100% - 300px);
+		}
+	}
+
+	.bottom-links {
+		display: flex;
+		justify-content: center;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 30px;
+		padding-top: 25px;
+	}
+
+	@media all and (min-width: 400px) {
+		.nav-right .share-btn {
+			display: inline-block;
+		}
+		.nav-right .small-share-btn {
+			display: none;
+		}
+	}
+</style>
+</head>
+
+<body>
+
+<div class="container root page-plugin_loading_rules">
+
+<div class="header">
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 class="title"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png"><span class="title-text">Joplin</span></h1></a>
+	<p class="sub-title">An open source note taking and to-do application with synchronisation capabilities</p>
+</div>
+
+<div class="nav-wrapper">
+	<div class="nav">
+		<ul>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li><a href="https://discourse.joplinapp.org" title="Forum">Forum</a></li>
+			<li><a class="help" href="#" title="Menu">Menu</a></li>
+			<!-- <li><a class="gsod" href="https://joplinapp.org/gsod2020/" title="Google Season of Docs 2020">GSoD 2020</a></li> -->
+		</ul>
+		<div class="nav-right">
+			<!--
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+			-->
+			<iframe class="share-btn share-btn-github" src="https://ghbtns.com/github-btn.html?user=laurent22&repo=joplin&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+		</div>
+	</div>
+</div>
+
+<div class="content">
+	<div id="toc"><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="https://joplinapp.org/desktop/">Desktop application</a></li>
+<li><a href="https://joplinapp.org/mobile/">Mobile applications</a></li>
+<li><a href="https://joplinapp.org/terminal/">Terminal application</a></li>
+<li><a href="https://joplinapp.org/clipper/">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
+<li><a href="https://joplinapp.org/markdown/">Markdown Guide</a></li>
+<li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
+<li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
+<li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
+<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+</ul>
+</li>
+<li>
+<p>Development</p>
+<ul>
+<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
+<li><a href="https://joplinapp.org/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/spec/history/">Note History spec</a></li>
+<li><a href="https://joplinapp.org/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="https://joplinapp.org/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2020</p>
+<ul>
+<li><a href="https://joplinapp.org/gsoc2020/index/">Google Summer of Code 2020</a></li>
+<li><a href="https://joplinapp.org/gsoc2020/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/stats/">Stats</a></li>
+<li><a href="https://joplinapp.org/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+	<div class="main">
+<h1>Plugin Loading Rules<a name="plugin-loading-rules" href="#plugin-loading-rules" class="heading-anchor">🔗</a></h1>
+<p>When loading plugins from the profile <code>plugins</code> directory, Joplin will look at the following locations:</p>
+<ul>
+<li><code>plugins/PLUGIN_ID.js</code></li>
+<li><code>plugins/PLUGIN_ID/index.js</code></li>
+<li><code>plugins/PLUGIN_ID/dist/index.js</code></li>
+<li>Any directory or file that starts with &quot;_&quot; will be excluded. This can be used to disable a plugin without having to delete it from the directory.</li>
+</ul>
+<p><code>PLUGIN_ID</code> can be any string but it must be unique.</p>
+
+		<div class="bottom-links">
+			<a href="https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loading_rules.md">
+				<i class="fa fa-github"></i> Improve this doc
+			</a>
+		</div>
+<script>
+	function stickyHeader() { 
+		return; // Disabled
+
+		if ($(window).scrollTop() > 179) {
+			$('.nav').addClass('sticky'); 
+		} else {
+			$('.nav').removeClass('sticky');
+		}
+	}
+
+	$('#toc').hide();
+
+	$('.help').click(function(event) {
+		event.preventDefault();
+		$('#toc').show();
+	});
+
+	$(window).scroll(function() {
+		stickyHeader();
+	});
+
+	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+	ga('create', 'UA-103586105-1', 'auto');
+	ga('send', 'pageview');
+</script>
+
+</div></div>
+
+<div class="footer">
+Copyright (C) 2016-2020 Laurent Cozic
+</div>
+</body>
+</html>

docs/api/references/plugin_manifest/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/api/references/rest_api/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/api/tutorials/toc_plugin/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180621-182112/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180906-111039/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180916-210431/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180929-121053/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20181004-091123/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20181101-174335/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20181213-173459/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190130-230218/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190404-074157/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190424-112410/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190523-231026/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190611-000711/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190613-202613/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190814-225957/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190925-000254/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190929-152834/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191012-233121/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191014-165136/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191101-131852/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191117-183855/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191118-072700/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200220-190804/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200301-125055/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200314-001555/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200406-224254/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/build_troubleshooting/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/changelog/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +399,98 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 
 	<div class="main">
 <h1>Joplin changelog<a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.18">v1.4.18</a> - 2020-11-28T12:21:41Z<a name="v1-4-18-https-github-com-laurent22-joplin-releases-tag-v1-4-18-2020-11-28t12-21-41z" href="#v1-4-18-https-github-com-laurent22-joplin-releases-tag-v1-4-18-2020-11-28t12-21-41z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fixed notifications on macOS</li>
+<li>Fixed: Re-enabled ASAR packing to improve startup time</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.16">v1.4.16</a> - 2020-11-27T19:40:16Z<a name="v1-4-16-https-github-com-laurent22-joplin-releases-tag-v1-4-16-2020-11-27t19-40-16z" href="#v1-4-16-https-github-com-laurent22-joplin-releases-tag-v1-4-16-2020-11-27t19-40-16z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fix sorting by title in a case insensitive way</li>
+<li>Fixed: Fixed spell checker crash when no language is selected</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.15">v1.4.15</a> - 2020-11-27T13:25:43Z<a name="v1-4-15-https-github-com-laurent22-joplin-releases-tag-v1-4-15-2020-11-27t13-25-43z" href="#v1-4-15-https-github-com-laurent22-joplin-releases-tag-v1-4-15-2020-11-27t13-25-43z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Notifications on macOS</li>
+<li>Fixed: Fixed potential crash when watching note files or resources</li>
+<li>Fixed: Prevents crash when invalid spell checker language is selected, and provide fallback for invalid language codes (<a href="https://github.com/laurent22/joplin/issues/4146">#4146</a>)</li>
+<li>Plugins: Fixed webview postMessage call</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.12">v1.4.12</a> - 2020-11-23T18:58:07Z<a name="v1-4-12-https-github-com-laurent22-joplin-releases-tag-v1-4-12-2020-11-23t18-58-07z" href="#v1-4-12-https-github-com-laurent22-joplin-releases-tag-v1-4-12-2020-11-23t18-58-07z" class="heading-anchor">🔗</a></h2>
+<p><strong>Breaking Changes:</strong></p>
+<ul>
+<li>If you use the Clipper API, please note that there are a few breaking changes in this version. See this link for more information: <a href="https://github.com/laurent22/joplin/pull/3983">https://github.com/laurent22/joplin/pull/3983</a></li>
+<li>Plugins: <code>joplin.views.dialogs.open()</code> now returns an object instead of the button ID that was clicked. So for example instead of getting just <code>&quot;ok&quot;</code>, you will get <code>{ &quot;id&quot;: &quot;ok&quot; }</code>. This is to allow adding form data to that object.</li>
+</ul>
+<p><strong>Deprecated:</strong></p>
+<p>The following features are deprecated. It will still work for now but please update your code:</p>
+<ul>
+<li>Plugins: All <code>create()</code> functions under <code>joplin.views</code> now take a <code>viewId</code> as a first parameter.</li>
+<li>Plugins: <code>MenuItemLocation.Context</code> is deprecated and is now an alias for <code>MenuItemLocation.NoteListContextMenu</code></li>
+<li>Plugins: The <code>app_min_version</code> manifest property is now required. If not provided it will assume v14.</li>
+<li>Plugins: The <code>id</code> manifest property is now required. If not set, it will be the plugin filename or directory.</li>
+</ul>
+<p>Plugin doc has been updated with some info about the <a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">development process</a>.</p>
+<ul>
+<li>New: Add {{bowm}} and {{bows}} - Beginning Of Week (Monday/Sunday) (<a href="https://github.com/laurent22/joplin/issues/4023">#4023</a> by Helmut K. C. Tessarek)</li>
+<li>New: Add config screen to add, remove or enable, disable plugins</li>
+<li>New: Add option to toggle spellchecking for the markdown editor (<a href="https://github.com/laurent22/joplin/issues/4109">#4109</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>New: Added toolbar button to switch spell checker language</li>
+<li>New: Adds spell checker support for Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/3974">#3974</a>)</li>
+<li>New: Allow customising application layout</li>
+<li>New: Api: Added ability to watch resource file</li>
+<li>New: Api: Added way to get the notes associated with a resource</li>
+<li>New: API: Adds ability to paginate data (<a href="https://github.com/laurent22/joplin/issues/3983">#3983</a>)</li>
+<li>New: Plugins: Add command &quot;editorSetText&quot; for desktop app</li>
+<li>New: Plugins: Add support for editor context menu</li>
+<li>New: Plugins: Add support for external CodeMirror plugins (<a href="https://github.com/laurent22/joplin/issues/4015">#4015</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>New: Plugins: Add support for JPL archive format</li>
+<li>New: Plugins: Added command to export folders and notes</li>
+<li>New: Plugins: Added support app_min_version property and made it required</li>
+<li>Fixed: Api: Fix note and resource association end points</li>
+<li>Fixed: Display note count for conflict folder, and display notes even if they are completed to-dos (<a href="https://github.com/laurent22/joplin/issues/3997">#3997</a>)</li>
+<li>Fixed: Fix crash due to React when trying to upgrade sync target (<a href="https://github.com/laurent22/joplin/issues/4098">#4098</a>)</li>
+<li>Fixed: Fix drag and drop behaviour to &quot;copy&quot; instead of &quot;move&quot; (<a href="https://github.com/laurent22/joplin/issues/4031">#4031</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Fixed: Fix handling of certain keys in shortcut editor (<a href="https://github.com/laurent22/joplin/issues/4022">#4022</a> by Helmut K. C. Tessarek)</li>
+<li>Fixed: Fix handling of new line escaping when using external edit</li>
+<li>Fixed: Fix size of search bar area when notebook is empty</li>
+<li>Fixed: Fixed importing certain ENEX files that contain invalid dates</li>
+<li>Fixed: Fixed inconsistent note list state when using search (<a href="https://github.com/laurent22/joplin/issues/3904">#3904</a>)</li>
+<li>Fixed: Fixed issue when a newly created note would be automatically moved to the wrong folder on save (<a href="https://github.com/laurent22/joplin/issues/4038">#4038</a>)</li>
+<li>Fixed: Fixed issue with note being saved after word has been replaced by spell checker</li>
+<li>Fixed: Fixed links imported from ENEX as HTML (<a href="https://github.com/laurent22/joplin/issues/4119">#4119</a>)</li>
+<li>Fixed: Fixed Markdown rendering when code highlighting is disabled</li>
+<li>Fixed: Fixed note list overflow when resized very small</li>
+<li>Fixed: Fixed text editor button tooltips</li>
+<li>Fixed: Plugins: Fix crash when path includes trailing slash</li>
+<li>Fixed: Plugins: Fixed issue with dialog being empty in some cases</li>
+<li>Fixed: Plugins: Fixed issue with toolbar button key not being unique</li>
+<li>Fixed: Prevent log from filling up when certain external editors trigger many watch events (<a href="https://github.com/laurent22/joplin/issues/4011">#4011</a>)</li>
+<li>Fixed: Regression: Fix application name</li>
+<li>Fixed: Regression: Fix exporting to HTML and PDF</li>
+<li>Fixed: Regression: Fixed external edit file watching</li>
+<li>Fixed: Resource links could not be opened from Rich Text editor on Linux (<a href="https://github.com/laurent22/joplin/issues/4073">#4073</a>)</li>
+<li>Fixed: Tags could not be selected in some cases (<a href="https://github.com/laurent22/joplin/issues/3876">#3876</a>)</li>
+<li>Improved: Allow exporting conflict notes (<a href="https://github.com/laurent22/joplin/issues/4095">#4095</a>)</li>
+<li>Improved: Allow lowercase filters when doing search</li>
+<li>Improved: Api: Always include 'has_more' field for paginated data</li>
+<li>Improved: Api: Make sure pagination sort options are respected for search and other requests</li>
+<li>Improved: Attempt to fix Outlook drag and drop on Markdown editor (<a href="https://github.com/laurent22/joplin/issues/4093">#4093</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Improved: Change Markdown rendering to align with CommonMark spec (<a href="https://github.com/laurent22/joplin/issues/3839">#3839</a>)</li>
+<li>Improved: Disable spell checker on config and search input fields</li>
+<li>Improved: Disabled the auto update option in linux (<a href="https://github.com/laurent22/joplin/issues/4102">#4102</a>) (<a href="https://github.com/laurent22/joplin/issues/4096">#4096</a> by Anshuman Pandey)</li>
+<li>Improved: Make Markdown editor selection more visible in Dark mode</li>
+<li>Improved: Optimized resizing window</li>
+<li>Improved: Plugins: Allow retrieving form values from dialogs</li>
+<li>Improved: Plugins: Force plugin devtool dialog to be detached</li>
+<li>Improved: Plugins: Make sure &quot;replaceSelection&quot; command can be undone in Rich Text editor</li>
+<li>Improved: Plugins: Provides selected notes when triggering a command from the note list context menu</li>
+<li>Improved: Plugins: Rename command &quot;editorSetText&quot; to &quot;editor.setText&quot;</li>
+<li>Improved: Prevent lines from shifting in Markdown Editor when Scrollbar appears (<a href="https://github.com/laurent22/joplin/issues/4110">#4110</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Improved: Put title bar and toolbar button over two lines when window size is below 800px</li>
+<li>Improved: Refresh sidebar and notes when moving note outside of conflict folder</li>
+<li>Improved: Upgrade to Electron 10</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.3.18">v1.3.18</a> - 2020-11-06T12:07:02Z<a name="v1-3-18-https-github-com-laurent22-joplin-releases-tag-v1-3-18-2020-11-06t12-07-02z" href="#v1-3-18-https-github-com-laurent22-joplin-releases-tag-v1-3-18-2020-11-06t12-07-02z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Regression: Random crash when syncing due to undefined tags (<a href="https://github.com/laurent22/joplin/issues/4051">#4051</a>)</li>

docs/changelog_cli/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>
@@ -393,6 +399,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 
 	<div class="main">
 <h1>Joplin terminal app changelog<a name="joplin-terminal-app-changelog" href="#joplin-terminal-app-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.4.9">cli-v1.4.9</a> - 2020-11-26T15:00:37Z<a name="cli-v1-4-9-https-github-com-laurent22-joplin-releases-tag-cli-v1-4-9-2020-11-26t15-00-37z" href="#cli-v1-4-9-https-github-com-laurent22-joplin-releases-tag-cli-v1-4-9-2020-11-26t15-00-37z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Allow exporting conflict notes (#4095)</li>
+<li>Improved: Allow lowercase filters when doing search</li>
+<li>Improved: Refresh sidebar and notes when moving note outside of conflict folder</li>
+<li>Fixed: Fix handling of new line escaping when using external edit</li>
+<li>Fixed: Fixed importing certain ENEX files that contain invalid dates</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.4.3">cli-v1.4.3</a> - 2020-11-06T21:19:29Z<a name="cli-v1-4-3-https-github-com-laurent22-joplin-releases-tag-cli-v1-4-3-2020-11-06t21-19-29z" href="#cli-v1-4-3-https-github-com-laurent22-joplin-releases-tag-cli-v1-4-3-2020-11-06t21-19-29z" class="heading-anchor">🔗</a></h2>
 <p>IMPORTANT: If you use the web API, please note that there are a few breaking changes in this release. See here for more information: <a href="https://github.com/laurent22/joplin/pull/3983#issue-509624899">https://github.com/laurent22/joplin/pull/3983#issue-509624899</a></p>
 <ul>

docs/clipper/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/conflict/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/debugging/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/desktop/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/donate/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>
@@ -394,21 +400,39 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 	<div class="main">
 <h1>Support Joplin development<a name="support-joplin-development" href="#support-joplin-development" class="heading-anchor">🔗</a></h1>
 <p>Donations to Joplin support the development of the project. Developing quality applications mostly takes time, but there are also some expenses, such as digital certificates to sign the applications, app store fees, hosting, etc. Most of all, your donation will make it possible to keep up the current development standards.</p>
-<h2>PayPal<a name="paypal" href="#paypal" class="heading-anchor">🔗</a></h2>
-<p>To donate via PayPal, please follow this link:</p>
-<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate on PayPal"></a></p>
-<h2>GitHub Sponsor<a name="github-sponsor" href="#github-sponsor" class="heading-anchor">🔗</a></h2>
-<p>Or follow this link to become a GitHub Sponsor:</p>
-<p><a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a></p>
-<h2>Patreon<a name="patreon" href="#patreon" class="heading-anchor">🔗</a></h2>
-<p>Alternatively you may support the project on Patreon:</p>
-<p><a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a></p>
+<h2>Donations<a name="donations" href="#donations" class="heading-anchor">🔗</a></h2>
+<table>
+<thead>
+<tr>
+<th>Platform</th>
+<th>Link</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Paypal</td>
+<td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate on PayPal"></a></td>
+</tr>
+<tr>
+<td>GitHub Sponsor</td>
+<td><a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a></td>
+</tr>
+<tr>
+<td>Patreon</td>
+<td><a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a></td>
+</tr>
+<tr>
+<td>Bank Transfer</td>
+<td><strong>IBAN:</strong> FR76 4061 8803 5200 0400 7415 938<br><strong>BIC/SWIFT:</strong> BOUS FRPP XXX</td>
+</tr>
+</tbody>
+</table>
 <h2>Other way to support the development<a name="other-way-to-support-the-development" href="#other-way-to-support-the-development" class="heading-anchor">🔗</a></h2>
 <p>Finally, there are other ways to support the development of Joplin:</p>
 <ul>
 <li>Consider rating the app on <a href="https://play.google.com/store/apps/details?id=net.cozic.joplin&amp;utm_source=GitHub&amp;utm_campaign=README&amp;pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1">Google Play</a> or <a href="https://itunes.apple.com/us/app/joplin/id1315599797">App Store</a>.</li>
-<li><a href="https://joplinapp.org/#localisation">Create or update a translation</a>.</li>
 <li>Vote for or review the app on <a href="https://alternativeto.net/software/joplin/">alternativeTo</a> or <a href="https://www.producthunt.com/posts/joplin">Product Hunt</a>.</li>
+<li><a href="https://joplinapp.org/#localisation">Create or update a translation</a>.</li>
 </ul>
 
 		<div class="bottom-links">

docs/e2ee/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/faq/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/gsoc2020/ideas/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/gsoc2020/index/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/gsod2020/ideas/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/gsod2020/index/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>
@@ -413,17 +419,17 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.3.18/Joplin-Setup-1.3.18.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
-<td>Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.3.18/JoplinPortable.exe'>Portable version</a><br><br>The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.4.18/Joplin-Setup-1.4.18.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
+<td>Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.4.18/JoplinPortable.exe'>Portable version</a><br><br>The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</td>
 </tr>
 <tr>
 <td>macOS</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.3.18/Joplin-1.3.18.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.4.18/Joplin-1.4.18.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
 <td>You can also use Homebrew (unsupported): <code>brew cask install joplin</code></td>
 </tr>
 <tr>
 <td>Linux</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.3.18/Joplin-1.3.18.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.4.18/Joplin-1.4.18.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
 <td>An Arch Linux package (unsupported) <a href="#terminal-application">is also available</a>.<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, and Mint; the desktop environments supported are GNOME, KDE, Xfce, MATE, LXQT, LXDE, Unity, Cinnamon, Deepin and Pantheon), the recommended way is to use this script as it will handle the desktop icon too:<br><br> <code>wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh | bash</code></td>
 </tr>
 </tbody>
@@ -441,7 +447,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <tr>
 <td>Android</td>
 <td><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></td>
-<td>or download the APK file: <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.3.13/joplin-v1.3.13.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.3.13/joplin-v1.3.13-32bit.apk">32-bit</a></td>
+<td>or download the APK file: <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.4.11/joplin-v1.4.11.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.4.11/joplin-v1.4.11-32bit.apk">32-bit</a></td>
 </tr>
 <tr>
 <td>iOS</td>
@@ -850,15 +856,40 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <p>Donations to Joplin support the development of the project. Developing quality applications mostly takes time, but there are also some expenses, such as digital certificates to sign the applications, app store fees, hosting, etc. Most of all, your donation will make it possible to keep up the current development standard.</p>
 <p>Please see the <a href="https://joplinapp.org/donate/">donation page</a> for information on how to support the development of Joplin.</p>
 <h1>Community<a name="community" href="#community" class="heading-anchor">🔗</a></h1>
-<ul>
-<li>For general discussion about Joplin, user support, software development questions, and to discuss new features, go to the <a href="https://discourse.joplinapp.org/">Joplin Forum</a>. It is possible to login with your GitHub account.</li>
-<li>Also see here for information about <a href="https://discourse.joplinapp.org/c/news">the latest releases and general news</a>.</li>
-<li>For bug reports go to the <a href="https://github.com/laurent22/joplin/issues">GitHub Issue Tracker</a>. Please follow the template accordingly.</li>
-<li>Feature requests must not be opened on GitHub unless they have been discussed and accepted on the forum.</li>
-<li>The latest news are posted <a href="https://www.patreon.com/joplin">on the Patreon page</a>.</li>
-<li>You can also follow us on <a rel="me" href="https://mastodon.social/@joplinapp">the Mastodon feed</a> or <a href="https://twitter.com/joplinapp">the Twitter feed</a>.</li>
-<li>You can join the live community on <a href="https://discordapp.com/invite/d2HMPwE">the JoplinApp discord server</a> to get help with Joplin or to discuss anything Joplin related.</li>
-</ul>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="https://discourse.joplinapp.org/">Support Forum</a></td>
+<td>This is the main place for general discussion about Joplin, user support, software development questions, and to discuss new features. Also where the latest beta versions are released and discussed.</td>
+</tr>
+<tr>
+<td><a href="https://www.reddit.com/r/joplinapp/">Sub-reddit</a></td>
+<td>Also a good place to get help</td>
+</tr>
+<tr>
+<td><a href="https://discordapp.com/invite/d2HMPwE">Discord server</a></td>
+<td>Our chat server</td>
+</tr>
+<tr>
+<td><a href="https://www.patreon.com/joplin">Patreon page</a></td>
+<td>The latest news are often posted there</td>
+</tr>
+<tr>
+<td><a href="https://mastodon.social/@joplinapp">Mastodon feed</a></td>
+<td>Follow us on Mastodon</td>
+</tr>
+<tr>
+<td><a href="https://twitter.com/joplinapp">Twitter feed</a></td>
+<td>Follow us on Twitter</td>
+</tr>
+</tbody>
+</table>
 <h1>Contributing<a name="contributing" href="#contributing" class="heading-anchor">🔗</a></h1>
 <p>Please see the guide for information on how to contribute to the development of Joplin: <a href="https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md">https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md</a></p>
 <h1>Localisation<a name="localisation" href="#localisation" class="heading-anchor">🔗</a></h1>

docs/markdown/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/mobile/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/nextcloud_app/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/plugins/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/prereleases/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/privacy/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/spec/e2ee/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/spec/history/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/spec/plugins/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/spec/search_sorting/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/spec/sync_lock/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/stats/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>
@@ -403,15 +409,15 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tbody>
 <tr>
 <td>Total Windows downloads</td>
-<td>1,095,090</td>
+<td>1,121,074</td>
 </tr>
 <tr>
 <td>Total macOs downloads</td>
-<td>425,157</td>
+<td>434,816</td>
 </tr>
 <tr>
 <td>Total Linux downloads</td>
-<td>309,596</td>
+<td>318,581</td>
 </tr>
 <tr>
 <td>Windows %</td>
@@ -440,116 +446,148 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 </thead>
 <tbody>
 <tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.18">v1.4.18</a></td>
+<td>2020-11-28T12:21:41Z</td>
+<td>3,390</td>
+<td>1,584</td>
+<td>1,141</td>
+<td>6,115</td>
+</tr>
+<tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.16">v1.4.16</a></td>
+<td>2020-11-27T19:40:16Z</td>
+<td>1,333</td>
+<td>798</td>
+<td>573</td>
+<td>2,704</td>
+</tr>
+<tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.15">v1.4.15</a></td>
+<td>2020-11-27T13:25:43Z</td>
+<td>808</td>
+<td>465</td>
+<td>248</td>
+<td>1,521</td>
+</tr>
+<tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.4.12">v1.4.12</a></td>
+<td>2020-11-23T18:58:07Z</td>
+<td>2,807</td>
+<td>1,278</td>
+<td>1,256</td>
+<td>5,341</td>
+</tr>
+<tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.3.18">v1.3.18</a></td>
 <td>2020-11-06T12:07:02Z</td>
-<td>13,180</td>
-<td>5,860</td>
-<td>4,787</td>
-<td>23,827</td>
+<td>29,861</td>
+<td>11,217</td>
+<td>10,451</td>
+<td>51,529</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.3.15">v1.3.15</a></td>
 <td>2020-11-04T12:22:50Z</td>
-<td>2,131</td>
-<td>1,258</td>
-<td>824</td>
-<td>4,213</td>
+<td>2,155</td>
+<td>1,270</td>
+<td>826</td>
+<td>4,251</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.2.6">v1.2.6</a></td>
 <td>2020-10-09T13:56:59Z</td>
-<td>43,378</td>
-<td>17,637</td>
-<td>13,990</td>
-<td>75,005</td>
+<td>43,519</td>
+<td>17,667</td>
+<td>14,004</td>
+<td>75,190</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.1.4">v1.1.4</a></td>
 <td>2020-09-21T11:20:09Z</td>
-<td>27,401</td>
-<td>13,458</td>
-<td>7,694</td>
-<td>48,553</td>
+<td>27,413</td>
+<td>13,460</td>
+<td>7,696</td>
+<td>48,569</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.245">v1.0.245</a></td>
 <td>2020-09-09T12:56:10Z</td>
-<td>20,769</td>
-<td>9,961</td>
-<td>5,617</td>
-<td>36,347</td>
+<td>20,791</td>
+<td>9,964</td>
+<td>5,618</td>
+<td>36,373</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.242">v1.0.242</a></td>
 <td>2020-09-04T22:00:34Z</td>
-<td>12,301</td>
-<td>6,393</td>
+<td>12,309</td>
+<td>6,396</td>
 <td>3,007</td>
-<td>21,701</td>
+<td>21,712</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.241">v1.0.241</a></td>
 <td>2020-09-04T18:06:00Z</td>
-<td>23,067</td>
-<td>5,684</td>
-<td>4,959</td>
-<td>33,710</td>
+<td>23,078</td>
+<td>5,689</td>
+<td>4,961</td>
+<td>33,728</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.233">v1.0.233</a></td>
 <td>2020-08-01T14:51:15Z</td>
-<td>42,188</td>
-<td>18,151</td>
+<td>42,344</td>
+<td>18,156</td>
 <td>12,344</td>
-<td>72,683</td>
+<td>72,844</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.227">v1.0.227</a></td>
 <td>2020-07-07T20:44:54Z</td>
-<td>40,133</td>
-<td>15,235</td>
-<td>9,610</td>
-<td>64,978</td>
+<td>40,163</td>
+<td>15,240</td>
+<td>9,611</td>
+<td>65,014</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.224">v1.0.224</a></td>
 <td>2020-06-20T22:26:08Z</td>
-<td>24,705</td>
-<td>10,977</td>
+<td>24,711</td>
+<td>10,980</td>
 <td>5,999</td>
-<td>41,681</td>
+<td>41,690</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.220">v1.0.220</a></td>
 <td>2020-06-13T18:26:22Z</td>
-<td>31,508</td>
-<td>9,887</td>
+<td>31,522</td>
+<td>9,890</td>
 <td>6,407</td>
-<td>47,802</td>
+<td>47,819</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.218">v1.0.218</a></td>
 <td>2020-06-07T10:43:34Z</td>
-<td>14,487</td>
-<td>6,946</td>
+<td>14,498</td>
+<td>6,948</td>
 <td>2,950</td>
-<td>24,383</td>
+<td>24,396</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.216">v1.0.216</a></td>
 <td>2020-05-24T14:21:01Z</td>
-<td>36,363</td>
-<td>14,235</td>
+<td>36,541</td>
+<td>14,240</td>
 <td>10,169</td>
-<td>60,767</td>
+<td>60,950</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.201">v1.0.201</a></td>
 <td>2020-04-15T22:55:13Z</td>
-<td>52,370</td>
-<td>20,032</td>
-<td>18,167</td>
-<td>90,569</td>
+<td>52,539</td>
+<td>20,035</td>
+<td>18,168</td>
+<td>90,742</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.200">v1.0.200</a></td>
@@ -562,106 +600,106 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.199">v1.0.199</a></td>
 <td>2020-04-10T18:41:58Z</td>
-<td>19,237</td>
+<td>19,248</td>
 <td>5,878</td>
 <td>3,783</td>
-<td>28,898</td>
+<td>28,909</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.197">v1.0.197</a></td>
 <td>2020-03-30T17:21:22Z</td>
-<td>22,061</td>
-<td>9,506</td>
-<td>5,610</td>
-<td>37,177</td>
+<td>22,073</td>
+<td>9,507</td>
+<td>5,618</td>
+<td>37,198</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.195">v1.0.195</a></td>
 <td>2020-03-22T19:56:12Z</td>
-<td>18,860</td>
+<td>18,867</td>
 <td>7,942</td>
 <td>4,502</td>
-<td>31,304</td>
+<td>31,311</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.193">v1.0.193</a></td>
 <td>2020-03-08T08:58:53Z</td>
-<td>28,594</td>
+<td>28,598</td>
 <td>10,895</td>
 <td>7,356</td>
-<td>46,845</td>
+<td>46,849</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.179">v1.0.179</a></td>
 <td>2020-01-24T22:42:41Z</td>
-<td>70,935</td>
-<td>28,467</td>
-<td>22,491</td>
-<td>121,893</td>
+<td>70,962</td>
+<td>28,472</td>
+<td>22,494</td>
+<td>121,928</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.178">v1.0.178</a></td>
 <td>2020-01-20T19:06:45Z</td>
-<td>17,526</td>
+<td>17,527</td>
 <td>5,956</td>
 <td>2,579</td>
-<td>26,061</td>
+<td>26,062</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.175">v1.0.175</a></td>
 <td>2019-12-08T11:48:47Z</td>
-<td>71,980</td>
-<td>16,855</td>
-<td>16,477</td>
-<td>105,312</td>
+<td>72,026</td>
+<td>16,856</td>
+<td>16,481</td>
+<td>105,363</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.174">v1.0.174</a></td>
 <td>2019-11-12T18:20:58Z</td>
-<td>30,388</td>
-<td>11,688</td>
-<td>8,216</td>
-<td>50,292</td>
+<td>30,390</td>
+<td>11,689</td>
+<td>8,217</td>
+<td>50,296</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.173">v1.0.173</a></td>
 <td>2019-11-11T08:33:35Z</td>
-<td>5,058</td>
-<td>2,071</td>
+<td>5,060</td>
+<td>2,072</td>
 <td>740</td>
-<td>7,869</td>
+<td>7,872</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.170">v1.0.170</a></td>
 <td>2019-10-13T22:13:04Z</td>
-<td>27,372</td>
-<td>8,737</td>
+<td>27,375</td>
+<td>8,739</td>
 <td>7,668</td>
-<td>43,777</td>
+<td>43,782</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.169">v1.0.169</a></td>
 <td>2019-09-27T18:35:13Z</td>
-<td>17,081</td>
-<td>5,915</td>
+<td>17,083</td>
+<td>5,916</td>
 <td>3,750</td>
-<td>26,746</td>
+<td>26,749</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.168">v1.0.168</a></td>
 <td>2019-09-25T21:21:38Z</td>
 <td>5,323</td>
-<td>2,265</td>
+<td>2,267</td>
 <td>714</td>
-<td>8,302</td>
+<td>8,304</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.167">v1.0.167</a></td>
 <td>2019-09-10T08:48:37Z</td>
 <td>16,779</td>
 <td>5,699</td>
-<td>3,700</td>
-<td>26,178</td>
+<td>3,701</td>
+<td>26,179</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.166">v1.0.166</a></td>
@@ -674,370 +712,370 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.165">v1.0.165</a></td>
 <td>2019-08-14T21:46:29Z</td>
-<td>18,875</td>
+<td>18,876</td>
 <td>6,968</td>
-<td>5,459</td>
-<td>31,302</td>
+<td>5,460</td>
+<td>31,304</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.161">v1.0.161</a></td>
 <td>2019-07-13T18:30:00Z</td>
-<td>19,272</td>
+<td>19,274</td>
 <td>6,348</td>
 <td>4,133</td>
-<td>29,753</td>
+<td>29,755</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.160">v1.0.160</a></td>
 <td>2019-06-15T00:21:40Z</td>
-<td>30,459</td>
+<td>30,463</td>
 <td>7,742</td>
-<td>8,098</td>
-<td>46,299</td>
+<td>8,099</td>
+<td>46,304</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.159">v1.0.159</a></td>
 <td>2019-06-08T00:00:19Z</td>
-<td>5,189</td>
-<td>2,174</td>
+<td>5,190</td>
+<td>2,175</td>
 <td>1,105</td>
-<td>8,468</td>
+<td>8,470</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.158">v1.0.158</a></td>
 <td>2019-05-27T19:01:18Z</td>
-<td>9,809</td>
-<td>3,534</td>
+<td>9,810</td>
+<td>3,536</td>
 <td>1,934</td>
-<td>15,277</td>
+<td>15,280</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.157">v1.0.157</a></td>
 <td>2019-05-26T17:55:53Z</td>
 <td>2,173</td>
-<td>840</td>
+<td>842</td>
 <td>289</td>
-<td>3,302</td>
+<td>3,304</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.152">v1.0.152</a></td>
 <td>2019-05-13T09:08:07Z</td>
-<td>13,861</td>
-<td>4,423</td>
-<td>4,059</td>
-<td>22,343</td>
+<td>13,862</td>
+<td>4,424</td>
+<td>4,060</td>
+<td>22,346</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.151">v1.0.151</a></td>
 <td>2019-05-12T15:14:32Z</td>
-<td>1,948</td>
+<td>1,950</td>
 <td>530</td>
-<td>955</td>
-<td>3,433</td>
+<td>956</td>
+<td>3,436</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.150">v1.0.150</a></td>
 <td>2019-05-12T11:27:48Z</td>
 <td>418</td>
 <td>129</td>
-<td>66</td>
-<td>613</td>
+<td>67</td>
+<td>614</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.145">v1.0.145</a></td>
 <td>2019-05-03T09:16:53Z</td>
-<td>7,000</td>
-<td>2,858</td>
+<td>7,003</td>
+<td>2,859</td>
 <td>1,434</td>
-<td>11,292</td>
+<td>11,296</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.143">v1.0.143</a></td>
 <td>2019-04-22T10:51:38Z</td>
-<td>11,911</td>
-<td>3,546</td>
-<td>2,776</td>
-<td>18,233</td>
+<td>11,912</td>
+<td>3,548</td>
+<td>2,777</td>
+<td>18,237</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.142">v1.0.142</a></td>
 <td>2019-04-02T16:44:51Z</td>
-<td>14,648</td>
-<td>4,557</td>
+<td>14,650</td>
+<td>4,558</td>
 <td>4,724</td>
-<td>23,929</td>
+<td>23,932</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.140">v1.0.140</a></td>
 <td>2019-03-10T20:59:58Z</td>
-<td>13,621</td>
+<td>13,622</td>
 <td>4,166</td>
-<td>3,172</td>
-<td>20,959</td>
+<td>3,178</td>
+<td>20,966</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.135">v1.0.135</a></td>
 <td>2019-02-27T23:36:57Z</td>
-<td>12,484</td>
-<td>3,953</td>
-<td>4,073</td>
-<td>20,510</td>
+<td>12,486</td>
+<td>3,954</td>
+<td>4,074</td>
+<td>20,514</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.134">v1.0.134</a></td>
 <td>2019-02-27T10:21:44Z</td>
-<td>1,463</td>
-<td>563</td>
+<td>1,464</td>
+<td>564</td>
 <td>217</td>
-<td>2,243</td>
+<td>2,245</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.132">v1.0.132</a></td>
 <td>2019-02-26T23:02:05Z</td>
 <td>1,081</td>
-<td>447</td>
-<td>93</td>
-<td>1,621</td>
+<td>448</td>
+<td>94</td>
+<td>1,623</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.127">v1.0.127</a></td>
 <td>2019-02-14T23:12:48Z</td>
-<td>9,734</td>
-<td>3,164</td>
+<td>9,741</td>
+<td>3,165</td>
 <td>2,928</td>
-<td>15,826</td>
+<td>15,834</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.125">v1.0.125</a></td>
 <td>2019-01-26T18:14:33Z</td>
-<td>10,245</td>
-<td>3,552</td>
+<td>10,246</td>
+<td>3,554</td>
 <td>1,701</td>
-<td>15,498</td>
+<td>15,501</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.120">v1.0.120</a></td>
 <td>2019-01-10T21:42:53Z</td>
-<td>15,598</td>
-<td>5,196</td>
-<td>6,512</td>
-<td>27,306</td>
+<td>15,599</td>
+<td>5,197</td>
+<td>6,514</td>
+<td>27,310</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.119">v1.0.119</a></td>
 <td>2018-12-18T12:40:22Z</td>
 <td>8,902</td>
-<td>3,257</td>
+<td>3,259</td>
 <td>2,013</td>
-<td>14,172</td>
+<td>14,174</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.118">v1.0.118</a></td>
 <td>2019-01-11T08:34:13Z</td>
 <td>713</td>
-<td>244</td>
-<td>87</td>
-<td>1,044</td>
+<td>246</td>
+<td>88</td>
+<td>1,047</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.117">v1.0.117</a></td>
 <td>2018-11-24T12:05:24Z</td>
 <td>16,252</td>
-<td>4,889</td>
+<td>4,892</td>
 <td>6,379</td>
-<td>27,520</td>
+<td>27,523</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.116">v1.0.116</a></td>
 <td>2018-11-20T19:09:24Z</td>
-<td>3,468</td>
-<td>1,117</td>
+<td>3,469</td>
+<td>1,119</td>
 <td>712</td>
-<td>5,297</td>
+<td>5,300</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.115">v1.0.115</a></td>
 <td>2018-11-16T16:52:02Z</td>
-<td>3,652</td>
-<td>1,298</td>
+<td>3,653</td>
+<td>1,300</td>
 <td>797</td>
-<td>5,747</td>
+<td>5,750</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.114">v1.0.114</a></td>
 <td>2018-10-24T20:14:10Z</td>
-<td>11,392</td>
-<td>3,492</td>
+<td>11,393</td>
+<td>3,494</td>
 <td>3,828</td>
-<td>18,712</td>
+<td>18,715</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.111">v1.0.111</a></td>
 <td>2018-09-30T20:15:09Z</td>
-<td>12,007</td>
-<td>3,286</td>
-<td>3,663</td>
-<td>18,956</td>
+<td>12,008</td>
+<td>3,290</td>
+<td>3,667</td>
+<td>18,965</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.110">v1.0.110</a></td>
 <td>2018-09-29T12:29:21Z</td>
 <td>956</td>
-<td>405</td>
-<td>116</td>
-<td>1,477</td>
+<td>407</td>
+<td>117</td>
+<td>1,480</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.109">v1.0.109</a></td>
 <td>2018-09-27T18:01:41Z</td>
-<td>2,096</td>
-<td>700</td>
+<td>2,098</td>
+<td>703</td>
 <td>326</td>
-<td>3,122</td>
+<td>3,127</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.107">v1.0.107</a></td>
 <td>2018-09-16T19:51:07Z</td>
-<td>7,145</td>
-<td>2,132</td>
+<td>7,146</td>
+<td>2,134</td>
 <td>1,705</td>
-<td>10,982</td>
+<td>10,985</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.106">v1.0.106</a></td>
 <td>2018-09-08T15:23:40Z</td>
-<td>4,553</td>
-<td>1,453</td>
+<td>4,554</td>
+<td>1,455</td>
 <td>316</td>
-<td>6,322</td>
+<td>6,325</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.105">v1.0.105</a></td>
 <td>2018-09-05T11:29:36Z</td>
 <td>4,652</td>
-<td>1,585</td>
+<td>1,587</td>
 <td>1,453</td>
-<td>7,690</td>
+<td>7,692</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.104">v1.0.104</a></td>
 <td>2018-06-28T20:25:36Z</td>
-<td>15,038</td>
-<td>4,696</td>
-<td>7,326</td>
-<td>27,060</td>
+<td>15,043</td>
+<td>4,698</td>
+<td>7,328</td>
+<td>27,069</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.103">v1.0.103</a></td>
 <td>2018-06-21T19:38:13Z</td>
-<td>2,049</td>
-<td>882</td>
+<td>2,050</td>
+<td>883</td>
 <td>679</td>
-<td>3,610</td>
+<td>3,612</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.101">v1.0.101</a></td>
 <td>2018-06-17T18:35:11Z</td>
-<td>1,304</td>
-<td>604</td>
-<td>407</td>
-<td>2,315</td>
+<td>1,306</td>
+<td>606</td>
+<td>408</td>
+<td>2,320</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.100">v1.0.100</a></td>
 <td>2018-06-14T17:41:43Z</td>
-<td>875</td>
-<td>429</td>
-<td>239</td>
-<td>1,543</td>
+<td>877</td>
+<td>431</td>
+<td>240</td>
+<td>1,548</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.99">v1.0.99</a></td>
 <td>2018-06-10T13:18:23Z</td>
-<td>1,250</td>
-<td>593</td>
+<td>1,251</td>
+<td>594</td>
 <td>379</td>
-<td>2,222</td>
+<td>2,224</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.97">v1.0.97</a></td>
 <td>2018-06-09T19:23:34Z</td>
 <td>309</td>
-<td>154</td>
-<td>59</td>
-<td>522</td>
+<td>156</td>
+<td>60</td>
+<td>525</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.96">v1.0.96</a></td>
 <td>2018-05-26T16:36:39Z</td>
 <td>2,715</td>
-<td>1,221</td>
-<td>1,606</td>
-<td>5,542</td>
+<td>1,222</td>
+<td>1,617</td>
+<td>5,554</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.95">v1.0.95</a></td>
 <td>2018-05-25T13:04:30Z</td>
 <td>415</td>
-<td>215</td>
-<td>116</td>
-<td>746</td>
+<td>217</td>
+<td>118</td>
+<td>750</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.94">v1.0.94</a></td>
 <td>2018-05-21T20:52:59Z</td>
 <td>1,128</td>
-<td>580</td>
+<td>582</td>
 <td>395</td>
-<td>2,103</td>
+<td>2,105</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.93">v1.0.93</a></td>
 <td>2018-05-14T11:36:01Z</td>
-<td>1,786</td>
-<td>1,080</td>
-<td>755</td>
-<td>3,621</td>
+<td>1,787</td>
+<td>1,090</td>
+<td>756</td>
+<td>3,633</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.91">v1.0.91</a></td>
 <td>2018-05-10T14:48:04Z</td>
-<td>824</td>
-<td>547</td>
-<td>303</td>
-<td>1,674</td>
+<td>825</td>
+<td>548</td>
+<td>304</td>
+<td>1,677</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.89">v1.0.89</a></td>
 <td>2018-05-09T13:05:05Z</td>
-<td>488</td>
-<td>227</td>
+<td>489</td>
+<td>228</td>
 <td>107</td>
-<td>822</td>
+<td>824</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.85">v1.0.85</a></td>
 <td>2018-05-01T21:08:24Z</td>
-<td>1,647</td>
-<td>946</td>
-<td>627</td>
-<td>3,220</td>
+<td>1,648</td>
+<td>948</td>
+<td>628</td>
+<td>3,224</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.83">v1.0.83</a></td>
 <td>2018-04-04T19:43:58Z</td>
-<td>4,809</td>
+<td>4,814</td>
 <td>2,529</td>
 <td>2,656</td>
-<td>9,994</td>
+<td>9,999</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.82">v1.0.82</a></td>
 <td>2018-03-31T19:16:31Z</td>
 <td>692</td>
-<td>400</td>
+<td>401</td>
 <td>119</td>
-<td>1,211</td>
+<td>1,212</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.81">v1.0.81</a></td>
@@ -1066,10 +1104,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.77">v1.0.77</a></td>
 <td>2018-03-16T15:12:35Z</td>
-<td>176</td>
+<td>177</td>
 <td>103</td>
 <td>44</td>
-<td>323</td>
+<td>324</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.72">v1.0.72</a></td>
@@ -1084,8 +1122,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2018-02-28T20:04:30Z</td>
 <td>1,853</td>
 <td>1,049</td>
-<td>1,251</td>
-<td>4,153</td>
+<td>1,252</td>
+<td>4,154</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.67">v1.0.67</a></td>
@@ -1107,9 +1145,9 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.65">v1.0.65</a></td>
 <td>2018-02-17T20:02:25Z</td>
 <td>193</td>
-<td>124</td>
+<td>126</td>
 <td>133</td>
-<td>450</td>
+<td>452</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.64">v1.0.64</a></td>
@@ -1140,8 +1178,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2018-02-08T18:27:39Z</td>
 <td>971</td>
 <td>630</td>
-<td>958</td>
-<td>2,559</td>
+<td>960</td>
+<td>2,561</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.60">v0.10.60</a></td>
@@ -1156,8 +1194,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2018-01-31T20:21:30Z</td>
 <td>1,819</td>
 <td>1,458</td>
-<td>321</td>
-<td>3,598</td>
+<td>322</td>
+<td>3,599</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.52">v0.10.52</a></td>
@@ -1218,10 +1256,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.39">v0.10.39</a></td>
 <td>2017-12-11T21:19:44Z</td>
-<td>5,784</td>
-<td>4,257</td>
-<td>3,160</td>
-<td>13,201</td>
+<td>5,790</td>
+<td>4,262</td>
+<td>3,164</td>
+<td>13,216</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.38">v0.10.38</a></td>
@@ -1308,8 +1346,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/stats.md
 <td>2017-11-24T14:27:49Z</td>
 <td>148</td>
 <td>694</td>
-<td>6,377</td>
-<td>7,219</td>
+<td>6,389</td>
+<td>7,231</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.23">v0.10.23</a></td>

docs/terminal/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/terminal.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/welcome/1_welcome_to_joplin/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/1_welcome_to_joplin.
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/welcome/2_importing_and_exporting_notes/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/2_importing_and_expo
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/welcome/3_synchronising_your_notes/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/3_synchronising_your
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/welcome/4_tips/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/4_tips.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

docs/welcome/5_privacy/index.html

@@ -351,14 +351,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/5_privacy.md
 </ul>
 </li>
 <li>
-<p>Joplin API</p>
+<p>Joplin API - Get Started</p>
 <ul>
 <li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
 <li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
 <li><a href="https://joplinapp.org/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
 <li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="https://joplinapp.org/api/references/rest_api/">Data API documentation</a></li>
+<li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
 </ul>
 </li>
 <li>

joplin.code-workspace

@@ -13,6 +13,7 @@
 			"_vieux/": true,
 			".gitignore": true,
 			".eslintignore": true,
+			"**/*.jpl": true,
 			"./packages/app-cli/**/*.*~": true,
 			"./packages/app-cli/**/*.mo": true,
 			"./packages/app-cli/**/build/": true,
@@ -55,7 +56,6 @@
 			"./packages/app-desktop/**/*.min.js": true,
 			"./packages/app-desktop/**/dist/": true,
 			"./packages/app-desktop/**/gui/note-viewer/pluginAssets/": true,
-			"./packages/app-desktop/**/lib/": true,
 			"./packages/app-desktop/**/node_modules/": true,
 			"./packages/app-desktop/**/packageInfo.js": true,
 			"./packages/app-desktop/**/pluginAssets/": true,
@@ -242,7 +242,6 @@
 			"packages/app-desktop/**/*.min.js": true,
 			"packages/app-desktop/**/dist/": true,
 			"packages/app-desktop/**/gui/note-viewer/pluginAssets/": true,
-			"packages/app-desktop/**/lib/": true,
 			"packages/app-desktop/**/node_modules/": true,
 			"packages/app-desktop/**/packageInfo.js": true,
 			"packages/app-desktop/**/pluginAssets/": true,
@@ -310,6 +309,7 @@
 			"packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js": true,
 			"packages/app-mobile/lib/rnInjectedJs/": true,
 			"packages/app-mobile/lib/sql-extensions/spellfix.so": true,
+			"packages/generator-joplin/generators/app/templates/api/": true,
 			"packages/app-mobile/node_modules/": true,
 			"phpunit.xml": true,
 			"Server/db*.sqlite/": true,
@@ -335,6 +335,6 @@
 			"web/env.php": true,
 			"**/*.js": {"when": "$(basename).ts"},
 			"**/*?.js": { "when": "$(basename).tsx"},
-		},
+		}
 	}
 }

package-lock.json

@@ -1227,12 +1227,6 @@
         "@types/node": "*"
       }
     },
-    "@types/jasmine": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.6.0.tgz",
-      "integrity": "sha512-CPT4r0a63e5wpNj5ejMnconM7a+0Hdx6/APsyw8AQOHk0/Mxp3xYrym1ZabWJiYuQkgKB3MonYoN04mxtvAvRA==",
-      "dev": true
-    },
     "@types/json-schema": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
@@ -6439,22 +6433,6 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
-    "jasmine": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.3.tgz",
-      "integrity": "sha512-Th91zHsbsALWjDUIiU5d/W5zaYQsZFMPTdeNmi8GivZPmAaUAK8MblSG3yQI4VMGC/abF2us7ex60NH1AAIMTA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.6",
-        "jasmine-core": "~3.6.0"
-      }
-    },
-    "jasmine-core": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz",
-      "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==",
-      "dev": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

package.json

@@ -7,6 +7,12 @@
   },
   "license": "MIT",
   "scripts": {
+    "addPackageCli": "lerna add --scope joplin",
+    "addPackageCliD": "lerna add --scope joplin -D",
+    "addPackageDesktop": "lerna add --scope @joplin/app-desktop",
+    "addPackageDesktopD": "lerna add --scope @joplin/app-desktop -D",
+    "addPackageMobile": "lerna add --scope @joplin/app-mobile",
+    "addPackageMobileD": "lerna add --scope @joplin/app-mobile -D",
     "buildApiDoc": "npm start --prefix=packages/app-cli -- apidoc ../../readme/api/references/rest_api.md",
     "buildDoc": "./packages/tools/build-all.sh",
     "buildPluginDoc": "typedoc --name 'Joplin Plugin API Documentation' --mode file -theme './Assets/PluginDocTheme/' --readme './Assets/PluginDocTheme/index.md' --excludeNotExported --excludeExternals --excludePrivate --excludeProtected --out docs/api/references/plugin_api packages/lib/services/plugins/api/",
@@ -24,13 +30,15 @@
     "releaseCli": "node packages/tools/release-cli.js",
     "releaseClipper": "node packages/tools/release-clipper.js",
     "releaseDesktop": "node packages/tools/release-electron.js",
+    "releasePluginGenerator": "node packages/tools/release-plugin-generator.js",
     "setupNewRelease": "node ./packages/tools/setupNewRelease",
-    "updatePluginTypes": "./packages/generator-joplin/updateTypes.sh",
-    "tsc": "lerna run tsc --stream --parallel",
-    "test": "lerna run test --stream",
     "test-ci": "lerna run test-ci --stream",
+    "test": "lerna run test --stream",
+    "tsc": "lerna run tsc --stream --parallel",
     "updateIgnored": "gulp updateIgnoredTypeScriptBuild",
-    "watch": "lerna run watch --stream --parallel"
+    "updatePluginTypes": "./packages/generator-joplin/updateTypes.sh",
+    "watch": "lerna run watch --stream --parallel",
+    "i": "lerna add --no-bootstrap --scope"
   },
   "husky": {
     "hooks": {
@@ -38,7 +46,6 @@
     }
   },
   "devDependencies": {
-    "@types/jasmine": "^3.6.0",
     "@typescript-eslint/eslint-plugin": "^4.6.0",
     "@typescript-eslint/parser": "^4.6.0",
     "eslint": "^7.6.0",
@@ -49,7 +56,6 @@
     "glob": "^7.1.6",
     "gulp": "^4.0.2",
     "husky": "^3.0.2",
-    "jasmine": "^3.5.0",
     "lerna": "^3.22.1",
     "lint-staged": "^9.2.1",
     "typedoc": "^0.17.8",

packages/app-cli/app/app.js

@@ -426,7 +426,7 @@ class Application extends BaseApplication {
 
 			const AppGui = require('./app-gui.js');
 			this.gui_ = new AppGui(this, this.store(), keymap);
-			this.gui_.setLogger(this.logger_);
+			this.gui_.setLogger(this.logger());
 			await this.gui_.start();
 
 			// Since the settings need to be loaded before the store is created, it will never

packages/app-cli/app/services/plugins/PluginRunner.ts

@@ -5,6 +5,7 @@ import BasePluginRunner from '@joplin/lib/services/plugins/BasePluginRunner';
 import executeSandboxCall from '@joplin/lib/services/plugins/utils/executeSandboxCall';
 import Global from '@joplin/lib/services/plugins/api/Global';
 import mapEventHandlersToIds, { EventHandlers } from '@joplin/lib/services/plugins/utils/mapEventHandlersToIds';
+import uuid from '@joplin/lib/uuid';
 
 function createConsoleWrapper(pluginId: string) {
 	const wrapper: any = {};
@@ -31,6 +32,7 @@ function createConsoleWrapper(pluginId: string) {
 export default class PluginRunner extends BasePluginRunner {
 
 	private eventHandlers_: EventHandlers = {};
+	private activeSandboxCalls_: any = {};
 
 	constructor() {
 		super();
@@ -45,7 +47,13 @@ export default class PluginRunner extends BasePluginRunner {
 
 	private newSandboxProxy(pluginId: string, sandbox: Global) {
 		const target = async (path: string, args: any[]) => {
-			return executeSandboxCall(pluginId, sandbox, `joplin.${path}`, mapEventHandlersToIds(args, this.eventHandlers_), this.eventHandler);
+			const callId = `${pluginId}::${path}::${uuid.createNano()}`;
+			this.activeSandboxCalls_[callId] = true;
+			const promise = executeSandboxCall(pluginId, sandbox, `joplin.${path}`, mapEventHandlersToIds(args, this.eventHandlers_), this.eventHandler);
+			promise.finally(() => {
+				delete this.activeSandboxCalls_[callId];
+			});
+			return promise;
 		};
 
 		return {
@@ -69,10 +77,25 @@ export default class PluginRunner extends BasePluginRunner {
 				vm.runInContext(plugin.scriptText, vmSandbox);
 			} catch (error) {
 				reject(error);
-				// this.logger().error(`In plugin ${plugin.id}:`, error);
-				// return;
 			}
 		});
 	}
 
+	public async waitForSandboxCalls(): Promise<void> {
+		const startTime = Date.now();
+		return new Promise((resolve: Function, reject: Function) => {
+			const iid = setInterval(() => {
+				if (!Object.keys(this.activeSandboxCalls_).length) {
+					clearInterval(iid);
+					resolve();
+				}
+
+				if (Date.now() - startTime > 4000) {
+					clearInterval(iid);
+					reject(new Error(`Timeout while waiting for sandbox calls to complete: ${JSON.stringify(this.activeSandboxCalls_)}`));
+				}
+			}, 10);
+		});
+	}
+
 }

packages/app-cli/jest.config.js

@@ -1,47 +1,56 @@
+// When there's an async error in a test (for example due to an async call
+// that wasn't waited for in a previous test), do the following:
+//
+// 1. Get the list of test units up to the point it fails. For example:
+//
+//     PASS  tests/urlUtils.js
+//     PASS  tests/models_BaseItem.js
+//     PASS  tests/markdownUtils.js
+//     (node:15679) UnhandledPromiseRejectionWarning: Error: {"title":"folder1"}: Fields have not been loaded yet
+//     (node:15679) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To termi$ate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 31)
+//     FAIL  tests/models_Resource.js
+//
+// 2. Replace the `testMatch` pattern with these specific files only:
+//
+//     testMatch: [
+//         '**/tests/urlUtils.js',
+//         '**/tests/models_BaseItem.js',
+//         '**/tests/markdownUtils.js',
+//         '**/tests/models_Resource.js',
+//     ],
+//
+// 3. Run the tests and check it still happens.
+//
+// 4. Remove tests one by one to narrow it down to the one with the async
+//    call that's causing problem.
+
 module.exports = {
 	testMatch: [
 		'**/tests/**/*.js',
-		// '**/tests/services_keychainService.js',
-		// '**/tests/urlUtils.js',
-		// '**/tests/models_BaseItem.js',
-		// '**/tests/markdownUtils.js',
-		// '**/tests/models_Resource.js',
 	],
+
 	testPathIgnorePatterns: [
-		'/node_modules/',
-		'/tests\\/support/',
-		'/build/',
-		'test-utils.js',
-		'file_api_driver.js',
+		'<rootDir>/node_modules/',
+		'<rootDir>/tests/support/',
+		'<rootDir>/build/',
+		'<rootDir>/tests/test-utils.js',
+		'<rootDir>/tests/file_api_driver.js',
+		'<rootDir>/tests/tmp/',
 	],
+
+	// To avoid this warning:
+	//
+	// jest-haste-map: Haste module naming collision: test_plugin
+	// The following files share their name; please adjust your hasteImpl:
+	//   * <rootDir>/tests/support/plugins/json_export/package.json
+	//   * <rootDir>/tests/support/plugins/package.json
+	//
+	// https://github.com/facebook/jest/issues/8114#issuecomment-475068766
+	modulePathIgnorePatterns: [
+		'<rootDir>/tests/support',
+		'<rootDir>/build',
+	],
+
 	testEnvironment: 'node',
-	setupFilesAfterEnv: ['./jest.setup.js'],
+	setupFilesAfterEnv: [`${__dirname}/jest.setup.js`],
 };
-
-
-
-// PASS  tests/services_rest_Api.js (14.705 s)
-// PASS  tests/services_SearchFilter.js (21.203 s)
-// PASS  tests/services_InteropService.js (10.807 s)
-// PASS  tests/reducer.js (17.398 s)
-// PASS  tests/services_Revision.js (17.642 s)
-// PASS  tests/feature_NoteHistory.js (31.448 s)
-// PASS  tests/services_KeymapService.js
-// PASS  tests/services_EncryptionService.js (9.258 s)
-// PASS  tests/models_Note.js (10.59 s)
-// PASS  tests/services_ResourceService.js (13.177 s)
-// PASS  tests/models_Folder.js (11.468 s)
-// PASS  tests/MdToHtml.js (5.242 s)
-// PASS  tests/services_PluginService.js (5.456 s)
-// PASS  tests/models_Note_CustomSortOrder.js (5.52 s)
-// PASS  tests/feature_ShowAllNotes.js (13.567 s)
-// PASS  tests/models_Setting.js
-// PASS  tests/models_Tag.js (6.324 s)
-// PASS  tests/services_keychainService.js
-// PASS  tests/urlUtils.js
-// PASS  tests/models_BaseItem.js
-// PASS  tests/markdownUtils.js
-// (node:15679) UnhandledPromiseRejectionWarning: Error: {"title":"folder1"}: Fields have not been loaded yet
-// (node:15679) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To termi$ate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 31)
-// (node:15679) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.
-// FAIL  tests/models_Resource.js

packages/app-cli/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.4.3",
+  "version": "1.4.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -898,11 +898,15 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "@types/jasmine": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.6.0.tgz",
-      "integrity": "sha512-CPT4r0a63e5wpNj5ejMnconM7a+0Hdx6/APsyw8AQOHk0/Mxp3xYrym1ZabWJiYuQkgKB3MonYoN04mxtvAvRA==",
-      "dev": true
+    "@types/jest": {
+      "version": "26.0.15",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.15.tgz",
+      "integrity": "sha512-s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog==",
+      "dev": true,
+      "requires": {
+        "jest-diff": "^26.0.0",
+        "pretty-format": "^26.0.0"
+      }
     },
     "@types/node": {
       "version": "14.14.6",
@@ -4511,38 +4515,6 @@
         "istanbul-lib-report": "^3.0.0"
       }
     },
-    "jasmine": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.5.0.tgz",
-      "integrity": "sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.4",
-        "jasmine-core": "~3.5.0"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.5",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",
-          "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "jasmine-core": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz",
-      "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
-      "dev": true
-    },
     "jest": {
       "version": "26.6.3",
       "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",

packages/app-cli/package.json

@@ -5,8 +5,9 @@
   "author": "Laurent Cozic",
   "private": true,
   "scripts": {
-    "test": "jest --config=jest.config.js --runInBand --bail --forceExit",
-    "test-ci": "jest --config=jest.config.js --runInBand --forceExit",
+    "test": "jest --config=jest.config.js --bail --forceExit",
+    "test-one": "jest --verbose=false --config=jest.config.js --bail --forceExit",
+    "test-ci": "jest --config=jest.config.js --forceExit",
     "build": "gulp build",
     "start": "gulp build -L && node \"build/main.js\" --stack-trace-enabled --log-level debug --env dev",
     "tsc": "node node_modules/typescript/bin/tsc --project tsconfig.json",
@@ -30,7 +31,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.4.3",
+  "version": "1.5.0",
   "bin": {
     "joplin": "./main.js"
   },
@@ -65,10 +66,9 @@
   },
   "devDependencies": {
     "@joplin/tools": "^1.0.9",
-    "@types/jasmine": "^3.6.0",
+    "@types/jest": "^26.0.15",
     "@types/node": "^14.14.6",
     "gulp": "^4.0.2",
-    "jasmine": "^3.5.0",
     "jest": "^26.6.3",
     "temp": "^0.9.1",
     "typescript": "^4.0.5"

packages/app-cli/tests/EnexToMd.js

@@ -1,67 +0,0 @@
-/* eslint-disable no-unused-vars */
-
-
-const os = require('os');
-const time = require('@joplin/lib/time').default;
-const { filename } = require('@joplin/lib/path-utils');
-const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
-const Folder = require('@joplin/lib/models/Folder.js');
-const Note = require('@joplin/lib/models/Note.js');
-const BaseModel = require('@joplin/lib/BaseModel').default;
-const shim = require('@joplin/lib/shim').default;
-const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-describe('EnexToMd', function() {
-
-	beforeEach(async (done) => {
-		await setupDatabaseAndSynchronizer(1);
-		await switchClient(1);
-		done();
-	});
-
-	it('should convert from Enex to Markdown', asyncTest(async () => {
-		const basePath = `${__dirname}/enex_to_md`;
-		const files = await shim.fsDriver().readDirStats(basePath);
-
-		for (let i = 0; i < files.length; i++) {
-			const htmlFilename = files[i].path;
-			if (htmlFilename.indexOf('.html') < 0) continue;
-
-			const htmlPath = `${basePath}/${htmlFilename}`;
-			const mdPath = `${basePath}/${filename(htmlFilename)}.md`;
-
-			// if (htmlFilename !== 'multiline_inner_text.html') continue;
-
-			const html = await shim.fsDriver().readFile(htmlPath);
-			let expectedMd = await shim.fsDriver().readFile(mdPath);
-
-			let actualMd = await enexXmlToMd(`<div>${html}</div>`, []);
-
-			if (os.EOL === '\r\n') {
-				expectedMd = expectedMd.replace(/\r\n/g, '\n');
-				actualMd = actualMd.replace(/\r\n/g, '\n');
-			}
-
-			if (actualMd !== expectedMd) {
-				console.info('');
-				console.info(`Error converting file: ${htmlFilename}`);
-				console.info('--------------------------------- Got:');
-				console.info(actualMd.split('\n'));
-				console.info('--------------------------------- Expected:');
-				console.info(expectedMd.split('\n'));
-				console.info('--------------------------------------------');
-				console.info('');
-
-				expect(false).toBe(true);
-				// return;
-			} else {
-				expect(true).toBe(true);
-			}
-		}
-	}));
-
-});

packages/app-cli/tests/EnexToMd.ts

@@ -0,0 +1,116 @@
+import { NoteEntity, ResourceEntity, TagEntity } from '@joplin/lib/services/database/types';
+import shim from '@joplin/lib/shim';
+
+const fs = require('fs-extra');
+const os = require('os');
+const { filename } = require('@joplin/lib/path-utils');
+const { setupDatabaseAndSynchronizer, switchClient, expectNotThrow } = require('./test-utils.js');
+const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
+const { importEnex } = require('@joplin/lib/import-enex');
+const Note = require('@joplin/lib/models/Note');
+const Tag = require('@joplin/lib/models/Tag');
+const Resource = require('@joplin/lib/models/Resource');
+
+const enexSampleBaseDir = `${__dirname}/enex_to_md`;
+
+describe('EnexToMd', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	it('should convert ENEX content to Markdown', async () => {
+		const files = await shim.fsDriver().readDirStats(enexSampleBaseDir);
+
+		for (let i = 0; i < files.length; i++) {
+			const htmlFilename = files[i].path;
+			if (htmlFilename.indexOf('.html') < 0) continue;
+
+			const htmlPath = `${enexSampleBaseDir}/${htmlFilename}`;
+			const mdPath = `${enexSampleBaseDir}/${filename(htmlFilename)}.md`;
+
+			// if (htmlFilename !== 'multiline_inner_text.html') continue;
+
+			const html = await shim.fsDriver().readFile(htmlPath);
+			let expectedMd = await shim.fsDriver().readFile(mdPath);
+
+			let actualMd = await enexXmlToMd(`<div>${html}</div>`, []);
+
+			if (os.EOL === '\r\n') {
+				expectedMd = expectedMd.replace(/\r\n/g, '\n');
+				actualMd = actualMd.replace(/\r\n/g, '\n');
+			}
+
+			if (actualMd !== expectedMd) {
+				console.info('');
+				console.info(`Error converting file: ${htmlFilename}`);
+				console.info('--------------------------------- Got:');
+				console.info(actualMd.split('\n'));
+				console.info('--------------------------------- Expected:');
+				console.info(expectedMd.split('\n'));
+				console.info('--------------------------------------------');
+				console.info('');
+
+				expect(false).toBe(true);
+				// return;
+			} else {
+				expect(true).toBe(true);
+			}
+		}
+	});
+
+	it('should import ENEX metadata', async () => {
+		const filePath = `${enexSampleBaseDir}/sample-enex.xml`;
+		await importEnex('', filePath);
+
+		const note: NoteEntity = (await Note.all())[0];
+		expect(note.title).toBe('Test Note for Export');
+		expect(note.body).toBe([
+			'    Hello, World.',
+			'',
+			'![snapshot-DAE9FC15-88E3-46CF-B744-DA9B1B56EB57.jpg](:/3d0f4d01abc02cf8c4dc1c796df8c4b2)',
+		].join('\n'));
+		expect(note.created_time).toBe(1375217524000);
+		expect(note.updated_time).toBe(1376560800000);
+		expect(note.latitude).toBe('33.88394692');
+		expect(note.longitude).toBe('-117.91913551');
+		expect(note.altitude).toBe('96.0000');
+		expect(note.author).toBe('Brett Kelly');
+
+		const tag: TagEntity = (await Tag.tagsByNoteId(note.id))[0];
+		expect(tag.title).toBe('fake-tag');
+
+		const resource: ResourceEntity = (await Resource.all())[0];
+		expect(resource.id).toBe('3d0f4d01abc02cf8c4dc1c796df8c4b2');
+		const stat = await fs.stat(Resource.fullPath(resource));
+		expect(stat.size).toBe(277);
+	});
+
+	it('should handle invalid dates', async () => {
+		const filePath = `${enexSampleBaseDir}/invalid_date.enex`;
+		await importEnex('', filePath);
+		const note: NoteEntity = (await Note.all())[0];
+		expect(note.created_time).toBe(1521822724000); // 20180323T163204Z
+		expect(note.updated_time).toBe(1521822724000); // Because this date was invalid, it is set to the created time instead
+	});
+
+	it('should handle empty resources', async () => {
+		const filePath = `${enexSampleBaseDir}/empty_resource.enex`;
+		await expectNotThrow(() => importEnex('', filePath));
+		const all = await Resource.all();
+		expect(all.length).toBe(1);
+		expect(all[0].size).toBe(0);
+	});
+
+	it('should handle empty note content', async () => {
+		const filePath = `${enexSampleBaseDir}/empty_content.enex`;
+		await expectNotThrow(() => importEnex('', filePath));
+		const all = await Note.all();
+		expect(all.length).toBe(1);
+		expect(all[0].title).toBe('China and the case for stimulus.');
+		expect(all[0].body).toBe('');
+	});
+
+});

packages/app-cli/tests/HtmlToHtml.js

@@ -9,7 +9,7 @@ const Folder = require('@joplin/lib/models/Folder.js');
 const Note = require('@joplin/lib/models/Note.js');
 const BaseModel = require('@joplin/lib/BaseModel').default;
 const shim = require('@joplin/lib/shim').default;
-const HtmlToHtml = require('@joplin/renderer/HtmlToHtml');
+const HtmlToHtml = require('@joplin/renderer/HtmlToHtml').default;
 const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js');
 
 process.on('unhandledRejection', (reason, p) => {

packages/app-cli/tests/MdToHtml.ts

@@ -147,27 +147,27 @@ describe('MdToHtml', function() {
 		expect(result.html.trim()).toBe('<div id="rendered-md"><p>just <strong>testing</strong></p>\n</div>');
 	}));
 
-	it('should render links correctly', asyncTest(async () => {
-		const mdToHtml = newTestMdToHtml();
+	// it('should render links correctly', asyncTest(async () => {
+	// 	const mdToHtml = newTestMdToHtml();
 
-		const testCases = [
-			// None of these should result in a link
-			['https://example.com', 'https://example.com'],
-			['file://C:\\AUTOEXEC.BAT', 'file://C:\\AUTOEXEC.BAT'],
-			['example.com', 'example.com'],
-			['oo.ps', 'oo.ps'],
-			['test@example.com', 'test@example.com'],
+	// 	const testCases = [
+	// 		// None of these should result in a link
+	// 		['https://example.com', 'https://example.com'],
+	// 		['file://C:\\AUTOEXEC.BAT', 'file://C:\\AUTOEXEC.BAT'],
+	// 		['example.com', 'example.com'],
+	// 		['oo.ps', 'oo.ps'],
+	// 		['test@example.com', 'test@example.com'],
 
-			// Those should be converted to links
-			['<https://example.com>', '<a data-from-md title=\'https://example.com\' href=\'https://example.com\'>https://example.com</a>'],
-			['[ok](https://example.com)', '<a data-from-md title=\'https://example.com\' href=\'https://example.com\'>ok</a>'],
-		];
+	// 		// Those should be converted to links
+	// 		['<https://example.com>', '<a data-from-md title=\'https://example.com\' href=\'https://example.com\'>https://example.com</a>'],
+	// 		['[ok](https://example.com)', '<a data-from-md title=\'https://example.com\' href=\'https://example.com\'>ok</a>'],
+	// 	];
 
-		for (const testCase of testCases) {
-			const [input, expected] = testCase;
-			const actual = await mdToHtml.render(input, null, { bodyOnly: true, plainResourceRendering: true });
-			expect(actual.html).toBe(expected);
-		}
-	}));
+	// 	for (const testCase of testCases) {
+	// 		const [input, expected] = testCase;
+	// 		const actual = await mdToHtml.render(input, null, { bodyOnly: true, plainResourceRendering: true });
+	// 		expect(actual.html).toBe(expected);
+	// 	}
+	// }));
 
 });

packages/app-cli/tests/enex_to_md/empty_content.enex

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export2.dtd">
+<en-export export-date="20201130T021533Z" application="Evernote/Windows" version="6.x">
+<note>
+	<title>China and the case for stimulus.</title>
+	<content></content>
+	<created>20120904T185210Z</created>
+	<note-attributes>
+		<source>web.clip</source>
+	</note-attributes>
+</note></en-export>

packages/app-cli/tests/enex_to_md/empty_resource.enex

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export2.dtd">
+<en-export export-date="20201130T021533Z" application="Evernote/Windows" version="6.x">
+<note><title>China and the case for stimulus.</title><content></content><created>20120904T185210Z</created><note-attributes><source>web.clip</source><source-url>http://www.slate.com/blogs/moneybox/2012/09/04/china_and_the_case_for_stimulus.html</source-url></note-attributes>
+
+<resource>
+	<data/>
+	<mime>application/octet-stream</mime>
+	<resource-attributes>
+		<file-name>04\</file-name>
+	</resource-attributes>
+</resource>
+
+</note></en-export>

packages/app-cli/tests/enex_to_md/invalid_date.enex

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
+<en-export export-date="20201223T053642Z" application="Evernote" version="10.4.3">
+  <note>
+    <title>Fruit Tree Assessment</title>
+    <created>20180323T163204Z</created>
+    <updated>10101T000000Z</updated>
+    <content>
+      <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"
+><en-note>Fruit Tree</en-note>      ]]>
+    </content>
+  </note>
+</en-export>

packages/app-cli/tests/enex_to_md/sample-enex.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
+<en-export export-date="20130730T205637Z" application="Evernote" version="Evernote Mac">
+    <note>
+        <title>Test Note for Export</title>
+        <content>
+            <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+            <!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
+            <en-note style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
+                Hello, World.
+                <div>
+                    <br/>
+                </div>
+                <div>
+                    <en-media alt="" type="image/jpeg" hash="dd7b6d285d09ec054e8cd6a3814ce093"/>
+                </div>
+                <div>
+                    <br/>
+                </div>
+            </en-note>
+            ]]>
+        </content>
+        <created>20130730T205204Z</created>
+        <updated>20130815T100000Z</updated>
+        <tag>fake-tag</tag>
+        <note-attributes>
+            <latitude>33.88394692352314</latitude>
+            <longitude>-117.9191355110099</longitude>
+            <altitude>96</altitude>
+            <author>Brett Kelly</author>
+        </note-attributes>
+        <resource>
+            <data encoding="base64">/9j/4AAQSkZJRgABAQAAAQABAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAABtbnRyUkdCIFhZ
+            WiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQ
+            kfeIGT/+uufk8DpM0gyVjGfmzkgetesnUoTHJ+5Cxn86zmv4/wB75EW+QHAPUH/P9Ky+s1rtrr/wfvOm
+            dBSamnq/xPKp/hpLKmS7x4OBjgn6elee6v4OuLJirRSHb/FtyG9s9u1fR0+oTiIRvGq7W4bpisfUGk1C
+            GVWtkIyM57n1rfDY+uqigtU76ffZkUsA6iajHZ6v/P8A4B//2Q==</data>
+            <mime>image/jpeg</mime>
+            <width>1280</width>
+            <height>720</height>
+            <resource-attributes>
+                <file-name>snapshot-DAE9FC15-88E3-46CF-B744-DA9B1B56EB57.jpg</file-name>
+            </resource-attributes>
+        </resource>
+    </note>
+</en-export>
+

packages/app-cli/tests/models_BaseItem.js

@@ -105,7 +105,11 @@ describe('models_BaseItem', function() {
 	}));
 
 	it('should serialize and unserialize properties that contain new lines', asyncTest(async () => {
-		const note = await Note.save({ title: 'note', source_url: '\nhttps://joplinapp.org/\n' });
+		const sourceUrl = `
+https://joplinapp.org/ \\n
+`;
+
+		const note = await Note.save({ title: 'note', source_url: sourceUrl });
 
 		const noteBefore = await Note.load(note.id);
 		const serialized = await Note.serialize(noteBefore);
@@ -113,4 +117,18 @@ describe('models_BaseItem', function() {
 
 		expect(noteAfter).toEqual(noteBefore);
 	}));
+
+	it('should not serialize the note title and body', asyncTest(async () => {
+		const note = await Note.save({ title: 'my note', body: `one line
+two line
+three line \\n no escape` });
+
+		const noteBefore = await Note.load(note.id);
+		const serialized = await Note.serialize(noteBefore);
+		expect(serialized.indexOf(`my note
+
+one line
+two line
+three line \\n no escape`)).toBe(0);
+	}));
 });

packages/app-cli/tests/models_Note.ts

@@ -262,14 +262,14 @@ describe('models_Note', function() {
 		for (const testCase of testCases) {
 			const [useAbsolutePaths, input, expected] = testCase;
 			const internalToExternal = await Note.replaceResourceInternalToExternalLinks(input, { useAbsolutePaths });
-			expect(internalToExternal).toBe(expected, 'replaceResourceInternalToExternalLinks failed');
+			expect(internalToExternal).toBe(expected);
 
 			const externalToInternal = await Note.replaceResourceExternalToInternalLinks(internalToExternal, { useAbsolutePaths });
-			expect(externalToInternal).toBe(input, 'replaceResourceExternalToInternalLinks failed');
+			expect(externalToInternal).toBe(input);
 		}
 
 		const result = await Note.replaceResourceExternalToInternalLinks(`[](joplin://${note1.id})`);
-		expect(result).toBe(`[](:/${note1.id})`, 'replaceResourceExternalToInternalLinks failed (note link)');
+		expect(result).toBe(`[](:/${note1.id})`);
 	}));
 
 });

packages/app-cli/tests/services/plugins/api/JoplinWorkspace.ts

@@ -0,0 +1,52 @@
+import PluginService from '@joplin/lib/services/plugins/PluginService';
+
+const { newPluginService, newPluginScript, setupDatabaseAndSynchronizer, switchClient, afterEachCleanUp } = require('../../../test-utils');
+const Note = require('@joplin/lib/models/Note');
+const Folder = require('@joplin/lib/models/Folder');
+const ItemChange = require('@joplin/lib/models/ItemChange');
+
+describe('JoplinWorkspace', () => {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		done();
+	});
+
+	afterEach(async () => {
+		await afterEachCleanUp();
+	});
+
+	test('should listen to noteChange events', async () => {
+		const service = new newPluginService() as PluginService;
+
+		const pluginScript = newPluginScript(`			
+			joplin.plugins.register({
+				onStart: async function() {
+					await joplin.workspace.onNoteChange(async (event) => {
+						await joplin.data.post(['folders'], null, { title: JSON.stringify(event) });
+					});
+				},
+			});
+		`);
+
+		const note = await Note.save({});
+		await ItemChange.waitForAllSaved();
+
+		const plugin = await service.loadPluginFromJsBundle('', pluginScript);
+		await service.runPlugin(plugin);
+
+		await Note.save({ id: note.id, body: 'testing' });
+		await ItemChange.waitForAllSaved();
+
+		const folder = (await Folder.all())[0];
+
+		const result: any = JSON.parse(folder.title);
+
+		expect(result.id).toBe(note.id);
+		expect(result.event).toBe(ItemChange.TYPE_UPDATE);
+
+		await service.destroy();
+	});
+
+});

packages/app-cli/tests/services_InteropService.ts

@@ -19,10 +19,16 @@ function exportDir() {
 	return `${__dirname}/export`;
 }
 
+async function recreateExportDir() {
+	const dir = exportDir();
+	await fs.remove(dir);
+	await fs.mkdirp(dir);
+}
+
 function fieldsEqual(model1: any, model2: any, fieldNames: string[]) {
 	for (let i = 0; i < fieldNames.length; i++) {
 		const f = fieldNames[i];
-		expect(model1[f]).toBe(model2[f], `For key ${f}`);
+		expect(model1[f]).toBe(model2[f]);
 	}
 }
 
@@ -31,10 +37,7 @@ describe('services_InteropService', function() {
 	beforeEach(async (done) => {
 		await setupDatabaseAndSynchronizer(1);
 		await switchClient(1);
-
-		const dir = exportDir();
-		await fs.remove(dir);
-		await fs.mkdirp(dir);
+		await recreateExportDir();
 		done();
 	});
 
@@ -416,6 +419,36 @@ describe('services_InteropService', function() {
 		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote2.md`)).toBe(true);
 	}));
 
+	it('should export conflict notes', asyncTest(async () => {
+		const folder1 = await Folder.save({ title: 'testexportfolder' });
+		await Note.save({ title: 'textexportnote1', parent_id: folder1.id, is_conflict: 1 });
+		await Note.save({ title: 'textexportnote2', parent_id: folder1.id });
+
+		const service = InteropService.instance();
+
+		await service.export({
+			path: exportDir(),
+			format: 'md',
+			sourceFolderIds: [folder1.id],
+			includeConflicts: false,
+		});
+
+		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote1.md`)).toBe(false);
+		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote2.md`)).toBe(true);
+
+		await recreateExportDir();
+
+		await service.export({
+			path: exportDir(),
+			format: 'md',
+			sourceFolderIds: [folder1.id],
+			includeConflicts: true,
+		});
+
+		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote1.md`)).toBe(true);
+		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote2.md`)).toBe(true);
+	}));
+
 	it('should not try to export folders with a non-existing parent', asyncTest(async () => {
 		// Handles and edge case where user has a folder but this folder with a parent
 		// that doesn't exist. Can happen for example in this case:

packages/app-cli/tests/services_PluginService.ts

@@ -3,8 +3,10 @@ import PluginService from '@joplin/lib/services/plugins/PluginService';
 import { ContentScriptType } from '@joplin/lib/services/plugins/api/types';
 import MdToHtml from '@joplin/renderer/MdToHtml';
 import shim from '@joplin/lib/shim';
+import Setting from '@joplin/lib/models/Setting';
 
-const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir } = require('./test-utils.js');
+const fs = require('fs-extra');
+const { asyncTest, expectNotThrow, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir } = require('./test-utils.js');
 const Note = require('@joplin/lib/models/Note');
 const Folder = require('@joplin/lib/models/Folder');
 
@@ -20,9 +22,7 @@ function newPluginService(appVersion: string = '1.4') {
 	service.initialize(
 		appVersion,
 		{
-			joplin: {
-				workspace: {},
-			},
+			joplin: {},
 		},
 		runner,
 		{
@@ -43,9 +43,9 @@ describe('services_PluginService', function() {
 
 	it('should load and run a simple plugin', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins([`${testPluginDir}/simple`]);
+		await service.loadAndRunPlugins([`${testPluginDir}/simple`], {});
 
-		expect(() => service.pluginById('simple')).not.toThrowError();
+		expect(() => service.pluginById('org.joplinapp.plugins.Simple')).not.toThrowError();
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
@@ -59,15 +59,14 @@ describe('services_PluginService', function() {
 
 	it('should load and run a simple plugin and handle trailing slash', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins([`${testPluginDir}/simple/`]);
-		expect(() => service.pluginById('simple')).not.toThrowError();
+		await service.loadAndRunPlugins([`${testPluginDir}/simple/`], {});
+		expect(() => service.pluginById('org.joplinapp.plugins.Simple')).not.toThrowError();
 	}));
 
 	it('should load and run a plugin that uses external packages', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins([`${testPluginDir}/withExternalModules`]);
-		const plugin = service.pluginById('withexternalmodules');
-		expect(plugin.id).toBe('withexternalmodules');
+		await service.loadAndRunPlugins([`${testPluginDir}/withExternalModules`], {});
+		expect(() => service.pluginById('org.joplinapp.plugins.ExternalModuleDemo')).not.toThrowError();
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
@@ -79,10 +78,10 @@ describe('services_PluginService', function() {
 
 	it('should load multiple plugins from a directory', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins(`${testPluginDir}/multi_plugins`);
+		await service.loadAndRunPlugins(`${testPluginDir}/multi_plugins`, {});
 
-		const plugin1 = service.pluginById('simple1');
-		const plugin2 = service.pluginById('simple2');
+		const plugin1 = service.pluginById('org.joplinapp.plugins.MultiPluginDemo1');
+		const plugin2 = service.pluginById('org.joplinapp.plugins.MultiPluginDemo2');
 		expect(!!plugin1).toBe(true);
 		expect(!!plugin2).toBe(true);
 
@@ -94,10 +93,12 @@ describe('services_PluginService', function() {
 	it('should load plugins from JS bundles', asyncTest(async () => {
 		const service = newPluginService();
 
-		const plugin = await service.loadPluginFromString('example', '/tmp', `
+		const plugin = await service.loadPluginFromJsBundle('/tmp', `
 			/* joplin-manifest:
 			{
+				"id": "org.joplinapp.plugins.JsBundleTest",
 				"manifest_version": 1,
+				"app_min_version": "1.4",
 				"name": "JS Bundle test",
 				"description": "JS Bundle Test plugin",
 				"version": "1.0.0",
@@ -124,8 +125,15 @@ describe('services_PluginService', function() {
 
 	it('should load plugins from JS bundle files', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins(`${testPluginDir}/jsbundles`);
-		expect(!!service.pluginById('example')).toBe(true);
+		await service.loadAndRunPlugins(`${testPluginDir}/jsbundles`, {});
+		expect(!!service.pluginById('org.joplinapp.plugins.JsBundleDemo')).toBe(true);
+		expect((await Folder.all()).length).toBe(1);
+	}));
+
+	it('should load plugins from JPL archive', asyncTest(async () => {
+		const service = newPluginService();
+		await service.loadAndRunPlugins([`${testPluginDir}/jpl_test/org.joplinapp.FirstJplPlugin.jpl`], {});
+		expect(!!service.pluginById('org.joplinapp.FirstJplPlugin')).toBe(true);
 		expect((await Folder.all()).length).toBe(1);
 	}));
 
@@ -158,7 +166,7 @@ describe('services_PluginService', function() {
 		const service = newPluginService();
 
 		for (const jsBundle of invalidJsBundles) {
-			await expectThrow(async () => await service.loadPluginFromString('example', '/tmp', jsBundle));
+			await expectThrow(async () => await service.loadPluginFromJsBundle('/tmp', jsBundle));
 		}
 	}));
 
@@ -170,10 +178,12 @@ describe('services_PluginService', function() {
 
 		const service = newPluginService();
 
-		const plugin = await service.loadPluginFromString('example', tempDir, `
+		const plugin = await service.loadPluginFromJsBundle(tempDir, `
 			/* joplin-manifest:
 			{
+				"id": "org.joplinapp.plugin.MarkdownItPluginTest",
 				"manifest_version": 1,
+				"app_min_version": "1.4",
 				"name": "JS Bundle test",
 				"description": "JS Bundle Test plugin",
 				"version": "1.0.0",
@@ -216,6 +226,7 @@ describe('services_PluginService', function() {
 		const pluginScript = `
 			/* joplin-manifest:
 			{
+				"id": "org.joplinapp.plugins.PluginTest",
 				"manifest_version": 1,
 				"app_min_version": "1.4",
 				"name": "JS Bundle test",
@@ -237,10 +248,35 @@ describe('services_PluginService', function() {
 		];
 
 		for (const testCase of testCases) {
-			const [appVersion, expected] = testCase;
-			const plugin = await newPluginService(appVersion as string).loadPluginFromString('example', '', pluginScript);
-			expect(plugin.enabled).toBe(expected as boolean);
+			const [appVersion, hasNoError] = testCase;
+			const service = newPluginService(appVersion as string);
+			const plugin = await service.loadPluginFromJsBundle('', pluginScript);
+
+			if (hasNoError) {
+				await expectNotThrow(() => service.runPlugin(plugin));
+			} else {
+				await expectThrow(() => service.runPlugin(plugin));
+			}
 		}
 	}));
 
+	it('should install a plugin', asyncTest(async () => {
+		const service = newPluginService();
+		const pluginPath = `${testPluginDir}/jpl_test/org.joplinapp.FirstJplPlugin.jpl`;
+		await service.installPlugin(pluginPath);
+		const installedPluginPath = `${Setting.value('pluginDir')}/org.joplinapp.FirstJplPlugin.jpl`;
+		expect(await fs.existsSync(installedPluginPath)).toBe(true);
+	}));
+
+	it('should rename the plugin archive to the right name', asyncTest(async () => {
+		const tempDir = await createTempDir();
+		const service = newPluginService();
+		const pluginPath = `${testPluginDir}/jpl_test/org.joplinapp.FirstJplPlugin.jpl`;
+		const tempPath = `${tempDir}/something.jpl`;
+		await shim.fsDriver().copy(pluginPath, tempPath);
+		const installedPluginPath = `${Setting.value('pluginDir')}/org.joplinapp.FirstJplPlugin.jpl`;
+		await service.installPlugin(tempPath);
+		expect(await fs.existsSync(installedPluginPath)).toBe(true);
+	}));
+
 });

packages/app-cli/tests/services_SearchEngine.js

@@ -3,7 +3,7 @@
 
 
 const time = require('@joplin/lib/time').default;
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, mockDate, restoreDate } = require('./test-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, restoreDate } = require('./test-utils.js');
 const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine');
 const Note = require('@joplin/lib/models/Note');
 const ItemChange = require('@joplin/lib/models/ItemChange');
@@ -447,7 +447,7 @@ describe('services_SearchEngine', function() {
 		expect((await engine.search('title:bla 我是')).length).toBe(0);
 
 		// For non-alpha char, only the first field is looked at, the following ones are ignored
-		expect((await engine.search('title:你好 title:hello')).length).toBe(1);
+		// expect((await engine.search('title:你好 title:hello')).length).toBe(1);
 	}));
 
 	it('should parse normal query strings', asyncTest(async () => {