fix paths

This reverts commit c79c9c4c2f.

Reason: Still need to discuss how it should be implemented. Ref:

https://discourse.joplinapp.org/t/testing-v1-8-2-title-bar-path-format-minor/16937/10

.eslintignore

@@ -18,6 +18,7 @@ packages/turndown-plugin-gfm/
 node_modules/
 packages/lib/lib/lib.js
 packages/lib/locales/index.js
+packages/lib/services/database/types.ts
 packages/app-cli/build
 packages/app-cli/build/
 packages/app-cli/locales
@@ -106,6 +107,15 @@ packages/app-cli/tests/Synchronizer.sharing.js.map
 packages/app-cli/tests/Synchronizer.tags.d.ts
 packages/app-cli/tests/Synchronizer.tags.js
 packages/app-cli/tests/Synchronizer.tags.js.map
+packages/app-cli/tests/Synchronizer.tools.d.ts
+packages/app-cli/tests/Synchronizer.tools.js
+packages/app-cli/tests/Synchronizer.tools.js.map
+packages/app-cli/tests/dateTimeFormats.d.ts
+packages/app-cli/tests/dateTimeFormats.js
+packages/app-cli/tests/dateTimeFormats.js.map
+packages/app-cli/tests/file-api-driver.d.ts
+packages/app-cli/tests/file-api-driver.js
+packages/app-cli/tests/file-api-driver.js.map
 packages/app-cli/tests/fsDriver.d.ts
 packages/app-cli/tests/fsDriver.js
 packages/app-cli/tests/fsDriver.js.map
@@ -115,6 +125,9 @@ packages/app-cli/tests/htmlUtils.js.map
 packages/app-cli/tests/models_Folder.d.ts
 packages/app-cli/tests/models_Folder.js
 packages/app-cli/tests/models_Folder.js.map
+packages/app-cli/tests/models_Folder.sharing.d.ts
+packages/app-cli/tests/models_Folder.sharing.js
+packages/app-cli/tests/models_Folder.sharing.js.map
 packages/app-cli/tests/models_Note.d.ts
 packages/app-cli/tests/models_Note.js
 packages/app-cli/tests/models_Note.js.map
@@ -154,6 +167,9 @@ packages/app-cli/tests/services_PluginService.js.map
 packages/app-cli/tests/services_ResourceService.d.ts
 packages/app-cli/tests/services_ResourceService.js
 packages/app-cli/tests/services_ResourceService.js.map
+packages/app-cli/tests/services_SearchEngineUtils.d.ts
+packages/app-cli/tests/services_SearchEngineUtils.js
+packages/app-cli/tests/services_SearchEngineUtils.js.map
 packages/app-cli/tests/services_keychainService.d.ts
 packages/app-cli/tests/services_keychainService.js
 packages/app-cli/tests/services_keychainService.js.map
@@ -211,6 +227,9 @@ packages/app-desktop/commands/stopExternalEditing.js.map
 packages/app-desktop/commands/toggleExternalEditing.d.ts
 packages/app-desktop/commands/toggleExternalEditing.js
 packages/app-desktop/commands/toggleExternalEditing.js.map
+packages/app-desktop/commands/toggleSafeMode.d.ts
+packages/app-desktop/commands/toggleSafeMode.js
+packages/app-desktop/commands/toggleSafeMode.js.map
 packages/app-desktop/gui/Button/Button.d.ts
 packages/app-desktop/gui/Button/Button.js
 packages/app-desktop/gui/Button/Button.js.map
@@ -238,6 +257,15 @@ packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.js.ma
 packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.d.ts
 packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.js.map
+packages/app-desktop/gui/Dialog.d.ts
+packages/app-desktop/gui/Dialog.js
+packages/app-desktop/gui/Dialog.js.map
+packages/app-desktop/gui/DialogButtonRow.d.ts
+packages/app-desktop/gui/DialogButtonRow.js
+packages/app-desktop/gui/DialogButtonRow.js.map
+packages/app-desktop/gui/DialogTitle.d.ts
+packages/app-desktop/gui/DialogTitle.js
+packages/app-desktop/gui/DialogTitle.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
@@ -325,6 +353,9 @@ packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.js.map
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.d.ts
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js.map
+packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.d.ts
+packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js
+packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js.map
 packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.d.ts
 packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.js
 packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.js.map
@@ -376,6 +407,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.js
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.js.map
 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
@@ -403,12 +437,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.js
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.test.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.test.js
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.test.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js.map
@@ -442,6 +470,12 @@ packages/app-desktop/gui/NoteEditor/commands/showRevisions.js.map
 packages/app-desktop/gui/NoteEditor/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/styles/index.js
 packages/app-desktop/gui/NoteEditor/styles/index.js.map
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.d.ts
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js.map
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.d.ts
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js.map
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.d.ts
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js.map
@@ -574,6 +608,9 @@ packages/app-desktop/gui/Root_UpgradeSyncTarget.js.map
 packages/app-desktop/gui/SearchBar/SearchBar.d.ts
 packages/app-desktop/gui/SearchBar/SearchBar.js
 packages/app-desktop/gui/SearchBar/SearchBar.js.map
+packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.d.ts
+packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js
+packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js.map
 packages/app-desktop/gui/ShareNoteDialog.d.ts
 packages/app-desktop/gui/ShareNoteDialog.js
 packages/app-desktop/gui/ShareNoteDialog.js.map
@@ -631,9 +668,15 @@ 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
+packages/app-desktop/gui/style/StyledFormLabel.d.ts
+packages/app-desktop/gui/style/StyledFormLabel.js
+packages/app-desktop/gui/style/StyledFormLabel.js.map
 packages/app-desktop/gui/style/StyledInput.d.ts
 packages/app-desktop/gui/style/StyledInput.js
 packages/app-desktop/gui/style/StyledInput.js.map
+packages/app-desktop/gui/style/StyledMessage.d.ts
+packages/app-desktop/gui/style/StyledMessage.js
+packages/app-desktop/gui/style/StyledMessage.js.map
 packages/app-desktop/gui/style/StyledTextInput.d.ts
 packages/app-desktop/gui/style/StyledTextInput.js
 packages/app-desktop/gui/style/StyledTextInput.js.map
@@ -742,6 +785,12 @@ packages/app-mobile/setUpQuickActions.js.map
 packages/app-mobile/utils/ShareExtension.d.ts
 packages/app-mobile/utils/ShareExtension.js
 packages/app-mobile/utils/ShareExtension.js.map
+packages/app-mobile/utils/ShareUtils.d.ts
+packages/app-mobile/utils/ShareUtils.js
+packages/app-mobile/utils/ShareUtils.js.map
+packages/app-mobile/utils/TlsUtils.d.ts
+packages/app-mobile/utils/TlsUtils.js
+packages/app-mobile/utils/TlsUtils.js.map
 packages/app-mobile/utils/checkPermissions.d.ts
 packages/app-mobile/utils/checkPermissions.js
 packages/app-mobile/utils/checkPermissions.js.map
@@ -817,12 +866,18 @@ packages/lib/BaseModel.js.map
 packages/lib/BaseSyncTarget.d.ts
 packages/lib/BaseSyncTarget.js
 packages/lib/BaseSyncTarget.js.map
+packages/lib/HtmlToMd.d.ts
+packages/lib/HtmlToMd.js
+packages/lib/HtmlToMd.js.map
 packages/lib/InMemoryCache.d.ts
 packages/lib/InMemoryCache.js
 packages/lib/InMemoryCache.js.map
 packages/lib/JoplinDatabase.d.ts
 packages/lib/JoplinDatabase.js
 packages/lib/JoplinDatabase.js.map
+packages/lib/JoplinError.d.ts
+packages/lib/JoplinError.js
+packages/lib/JoplinError.js.map
 packages/lib/JoplinServerApi.d.ts
 packages/lib/JoplinServerApi.js
 packages/lib/JoplinServerApi.js.map
@@ -853,6 +908,9 @@ packages/lib/commands/synchronize.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
+packages/lib/debug/DebugService.d.ts
+packages/lib/debug/DebugService.js
+packages/lib/debug/DebugService.js.map
 packages/lib/dummy.test.d.ts
 packages/lib/dummy.test.js
 packages/lib/dummy.test.js.map
@@ -886,6 +944,9 @@ packages/lib/locale.js.map
 packages/lib/markdownUtils.d.ts
 packages/lib/markdownUtils.js
 packages/lib/markdownUtils.js.map
+packages/lib/markdownUtils.test.d.ts
+packages/lib/markdownUtils.test.js
+packages/lib/markdownUtils.test.js.map
 packages/lib/markupLanguageUtils.d.ts
 packages/lib/markupLanguageUtils.js
 packages/lib/markupLanguageUtils.js.map
@@ -1045,6 +1106,12 @@ packages/lib/services/commands/ToolbarButtonUtils.js.map
 packages/lib/services/commands/commandsToMarkdownTable.d.ts
 packages/lib/services/commands/commandsToMarkdownTable.js
 packages/lib/services/commands/commandsToMarkdownTable.js.map
+packages/lib/services/commands/focusEditorIfEditorCommand.d.ts
+packages/lib/services/commands/focusEditorIfEditorCommand.js
+packages/lib/services/commands/focusEditorIfEditorCommand.js.map
+packages/lib/services/commands/isEditorCommand.d.ts
+packages/lib/services/commands/isEditorCommand.js
+packages/lib/services/commands/isEditorCommand.js.map
 packages/lib/services/commands/propsHaveChanged.d.ts
 packages/lib/services/commands/propsHaveChanged.js
 packages/lib/services/commands/propsHaveChanged.js.map
@@ -1300,6 +1367,12 @@ packages/lib/services/searchengine/filterParser.js.map
 packages/lib/services/searchengine/queryBuilder.d.ts
 packages/lib/services/searchengine/queryBuilder.js
 packages/lib/services/searchengine/queryBuilder.js.map
+packages/lib/services/share/ShareService.d.ts
+packages/lib/services/share/ShareService.js
+packages/lib/services/share/ShareService.js.map
+packages/lib/services/share/reducer.d.ts
+packages/lib/services/share/reducer.js
+packages/lib/services/share/reducer.js.map
 packages/lib/services/spellChecker/SpellCheckerService.d.ts
 packages/lib/services/spellChecker/SpellCheckerService.js
 packages/lib/services/spellChecker/SpellCheckerService.js.map
@@ -1321,6 +1394,12 @@ packages/lib/services/synchronizer/migrations/1.js.map
 packages/lib/services/synchronizer/migrations/2.d.ts
 packages/lib/services/synchronizer/migrations/2.js
 packages/lib/services/synchronizer/migrations/2.js.map
+packages/lib/services/synchronizer/tools.d.ts
+packages/lib/services/synchronizer/tools.js
+packages/lib/services/synchronizer/tools.js.map
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.d.ts
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js.map
 packages/lib/services/synchronizer/utils/types.d.ts
 packages/lib/services/synchronizer/utils/types.js
 packages/lib/services/synchronizer/utils/types.js.map

.github/stale.yml

@@ -11,6 +11,7 @@ exemptLabels:
   - "high"
   - "medium"
   - "spec"
+  - "cannot reproduce"
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable

.gitignore

@@ -93,6 +93,15 @@ packages/app-cli/tests/Synchronizer.sharing.js.map
 packages/app-cli/tests/Synchronizer.tags.d.ts
 packages/app-cli/tests/Synchronizer.tags.js
 packages/app-cli/tests/Synchronizer.tags.js.map
+packages/app-cli/tests/Synchronizer.tools.d.ts
+packages/app-cli/tests/Synchronizer.tools.js
+packages/app-cli/tests/Synchronizer.tools.js.map
+packages/app-cli/tests/dateTimeFormats.d.ts
+packages/app-cli/tests/dateTimeFormats.js
+packages/app-cli/tests/dateTimeFormats.js.map
+packages/app-cli/tests/file-api-driver.d.ts
+packages/app-cli/tests/file-api-driver.js
+packages/app-cli/tests/file-api-driver.js.map
 packages/app-cli/tests/fsDriver.d.ts
 packages/app-cli/tests/fsDriver.js
 packages/app-cli/tests/fsDriver.js.map
@@ -102,6 +111,9 @@ packages/app-cli/tests/htmlUtils.js.map
 packages/app-cli/tests/models_Folder.d.ts
 packages/app-cli/tests/models_Folder.js
 packages/app-cli/tests/models_Folder.js.map
+packages/app-cli/tests/models_Folder.sharing.d.ts
+packages/app-cli/tests/models_Folder.sharing.js
+packages/app-cli/tests/models_Folder.sharing.js.map
 packages/app-cli/tests/models_Note.d.ts
 packages/app-cli/tests/models_Note.js
 packages/app-cli/tests/models_Note.js.map
@@ -141,6 +153,9 @@ packages/app-cli/tests/services_PluginService.js.map
 packages/app-cli/tests/services_ResourceService.d.ts
 packages/app-cli/tests/services_ResourceService.js
 packages/app-cli/tests/services_ResourceService.js.map
+packages/app-cli/tests/services_SearchEngineUtils.d.ts
+packages/app-cli/tests/services_SearchEngineUtils.js
+packages/app-cli/tests/services_SearchEngineUtils.js.map
 packages/app-cli/tests/services_keychainService.d.ts
 packages/app-cli/tests/services_keychainService.js
 packages/app-cli/tests/services_keychainService.js.map
@@ -198,6 +213,9 @@ packages/app-desktop/commands/stopExternalEditing.js.map
 packages/app-desktop/commands/toggleExternalEditing.d.ts
 packages/app-desktop/commands/toggleExternalEditing.js
 packages/app-desktop/commands/toggleExternalEditing.js.map
+packages/app-desktop/commands/toggleSafeMode.d.ts
+packages/app-desktop/commands/toggleSafeMode.js
+packages/app-desktop/commands/toggleSafeMode.js.map
 packages/app-desktop/gui/Button/Button.d.ts
 packages/app-desktop/gui/Button/Button.js
 packages/app-desktop/gui/Button/Button.js.map
@@ -225,6 +243,15 @@ packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.js.ma
 packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.d.ts
 packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.js.map
+packages/app-desktop/gui/Dialog.d.ts
+packages/app-desktop/gui/Dialog.js
+packages/app-desktop/gui/Dialog.js.map
+packages/app-desktop/gui/DialogButtonRow.d.ts
+packages/app-desktop/gui/DialogButtonRow.js
+packages/app-desktop/gui/DialogButtonRow.js.map
+packages/app-desktop/gui/DialogTitle.d.ts
+packages/app-desktop/gui/DialogTitle.js
+packages/app-desktop/gui/DialogTitle.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
@@ -312,6 +339,9 @@ packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.js.map
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.d.ts
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js
 packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js.map
+packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.d.ts
+packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js
+packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js.map
 packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.d.ts
 packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.js
 packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.js.map
@@ -363,6 +393,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.js
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.js.map
 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
@@ -390,12 +423,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.js
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.test.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.test.js
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/getCopyableContent.test.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js.map
@@ -429,6 +456,12 @@ packages/app-desktop/gui/NoteEditor/commands/showRevisions.js.map
 packages/app-desktop/gui/NoteEditor/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/styles/index.js
 packages/app-desktop/gui/NoteEditor/styles/index.js.map
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.d.ts
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js.map
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.d.ts
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js
+packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js.map
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.d.ts
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js.map
@@ -561,6 +594,9 @@ packages/app-desktop/gui/Root_UpgradeSyncTarget.js.map
 packages/app-desktop/gui/SearchBar/SearchBar.d.ts
 packages/app-desktop/gui/SearchBar/SearchBar.js
 packages/app-desktop/gui/SearchBar/SearchBar.js.map
+packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.d.ts
+packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js
+packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.js.map
 packages/app-desktop/gui/ShareNoteDialog.d.ts
 packages/app-desktop/gui/ShareNoteDialog.js
 packages/app-desktop/gui/ShareNoteDialog.js.map
@@ -618,9 +654,15 @@ 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
+packages/app-desktop/gui/style/StyledFormLabel.d.ts
+packages/app-desktop/gui/style/StyledFormLabel.js
+packages/app-desktop/gui/style/StyledFormLabel.js.map
 packages/app-desktop/gui/style/StyledInput.d.ts
 packages/app-desktop/gui/style/StyledInput.js
 packages/app-desktop/gui/style/StyledInput.js.map
+packages/app-desktop/gui/style/StyledMessage.d.ts
+packages/app-desktop/gui/style/StyledMessage.js
+packages/app-desktop/gui/style/StyledMessage.js.map
 packages/app-desktop/gui/style/StyledTextInput.d.ts
 packages/app-desktop/gui/style/StyledTextInput.js
 packages/app-desktop/gui/style/StyledTextInput.js.map
@@ -729,6 +771,12 @@ packages/app-mobile/setUpQuickActions.js.map
 packages/app-mobile/utils/ShareExtension.d.ts
 packages/app-mobile/utils/ShareExtension.js
 packages/app-mobile/utils/ShareExtension.js.map
+packages/app-mobile/utils/ShareUtils.d.ts
+packages/app-mobile/utils/ShareUtils.js
+packages/app-mobile/utils/ShareUtils.js.map
+packages/app-mobile/utils/TlsUtils.d.ts
+packages/app-mobile/utils/TlsUtils.js
+packages/app-mobile/utils/TlsUtils.js.map
 packages/app-mobile/utils/checkPermissions.d.ts
 packages/app-mobile/utils/checkPermissions.js
 packages/app-mobile/utils/checkPermissions.js.map
@@ -804,12 +852,18 @@ packages/lib/BaseModel.js.map
 packages/lib/BaseSyncTarget.d.ts
 packages/lib/BaseSyncTarget.js
 packages/lib/BaseSyncTarget.js.map
+packages/lib/HtmlToMd.d.ts
+packages/lib/HtmlToMd.js
+packages/lib/HtmlToMd.js.map
 packages/lib/InMemoryCache.d.ts
 packages/lib/InMemoryCache.js
 packages/lib/InMemoryCache.js.map
 packages/lib/JoplinDatabase.d.ts
 packages/lib/JoplinDatabase.js
 packages/lib/JoplinDatabase.js.map
+packages/lib/JoplinError.d.ts
+packages/lib/JoplinError.js
+packages/lib/JoplinError.js.map
 packages/lib/JoplinServerApi.d.ts
 packages/lib/JoplinServerApi.js
 packages/lib/JoplinServerApi.js.map
@@ -840,6 +894,9 @@ packages/lib/commands/synchronize.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
+packages/lib/debug/DebugService.d.ts
+packages/lib/debug/DebugService.js
+packages/lib/debug/DebugService.js.map
 packages/lib/dummy.test.d.ts
 packages/lib/dummy.test.js
 packages/lib/dummy.test.js.map
@@ -873,6 +930,9 @@ packages/lib/locale.js.map
 packages/lib/markdownUtils.d.ts
 packages/lib/markdownUtils.js
 packages/lib/markdownUtils.js.map
+packages/lib/markdownUtils.test.d.ts
+packages/lib/markdownUtils.test.js
+packages/lib/markdownUtils.test.js.map
 packages/lib/markupLanguageUtils.d.ts
 packages/lib/markupLanguageUtils.js
 packages/lib/markupLanguageUtils.js.map
@@ -1032,6 +1092,12 @@ packages/lib/services/commands/ToolbarButtonUtils.js.map
 packages/lib/services/commands/commandsToMarkdownTable.d.ts
 packages/lib/services/commands/commandsToMarkdownTable.js
 packages/lib/services/commands/commandsToMarkdownTable.js.map
+packages/lib/services/commands/focusEditorIfEditorCommand.d.ts
+packages/lib/services/commands/focusEditorIfEditorCommand.js
+packages/lib/services/commands/focusEditorIfEditorCommand.js.map
+packages/lib/services/commands/isEditorCommand.d.ts
+packages/lib/services/commands/isEditorCommand.js
+packages/lib/services/commands/isEditorCommand.js.map
 packages/lib/services/commands/propsHaveChanged.d.ts
 packages/lib/services/commands/propsHaveChanged.js
 packages/lib/services/commands/propsHaveChanged.js.map
@@ -1287,6 +1353,12 @@ packages/lib/services/searchengine/filterParser.js.map
 packages/lib/services/searchengine/queryBuilder.d.ts
 packages/lib/services/searchengine/queryBuilder.js
 packages/lib/services/searchengine/queryBuilder.js.map
+packages/lib/services/share/ShareService.d.ts
+packages/lib/services/share/ShareService.js
+packages/lib/services/share/ShareService.js.map
+packages/lib/services/share/reducer.d.ts
+packages/lib/services/share/reducer.js
+packages/lib/services/share/reducer.js.map
 packages/lib/services/spellChecker/SpellCheckerService.d.ts
 packages/lib/services/spellChecker/SpellCheckerService.js
 packages/lib/services/spellChecker/SpellCheckerService.js.map
@@ -1308,6 +1380,12 @@ packages/lib/services/synchronizer/migrations/1.js.map
 packages/lib/services/synchronizer/migrations/2.d.ts
 packages/lib/services/synchronizer/migrations/2.js
 packages/lib/services/synchronizer/migrations/2.js.map
+packages/lib/services/synchronizer/tools.d.ts
+packages/lib/services/synchronizer/tools.js
+packages/lib/services/synchronizer/tools.js.map
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.d.ts
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js.map
 packages/lib/services/synchronizer/utils/types.d.ts
 packages/lib/services/synchronizer/utils/types.js
 packages/lib/services/synchronizer/utils/types.js.map

DEPLOY.md

@@ -0,0 +1,77 @@
+# Deploying Joplin apps and scripts
+
+Various scripts are provided to deploy the Joplin applications, scripts and tools.
+
+## Setting up version numbers
+
+Before new releases are created, all version numbers must be updated. This is done using the `setupNewRelease` script and passing it the new major.minor version number. For example:
+
+	npm run setupNewRelease -- 1.8
+
+Patch numbers are going to be incremented automatically when releasing each individual package.
+
+## Desktop application
+
+The desktop application is built for Windows, macOS and Linux via continuous integration, by pushing a version tag to GitHub. The process is automated using:
+
+	npm run releaseDesktop
+
+## Android application
+
+The app is built and upload to GitHub using:
+
+	npm run releaseAndroid -- --type=prerelease
+
+The "type" parameter can be either "release" or "prerelease"
+
+## iOS application
+
+It must be built and released manually using XCode.
+
+## CLI application
+
+Unlike the mobile or desktop application, the CLI app doesn't bundle its dependencies and is always installed from source. For that reason, all its `@joplin` dependencies must be deployed publicly first. This is done using:
+
+	npm run publishAll
+
+This is going to publish all the Joplin libraries, such as `@joplin/lib`, `@joplin/tools`, etc.
+
+Then in `app-cli/package.json`, all `@joplin` dependencies and devdependencies must be set to the last major/minor version. For example:
+
+```json
+"dependencies": {
+	"@joplin/lib": "1.8",
+	"@joplin/renderer": "1.8",
+	"...": "..."
+},
+"devDependencies": {
+	"@joplin/tools": "1.8",
+	"...": "..."
+}
+```
+
+Finally, to release the actual app, run:
+
+	npm run releaseCli
+
+## Joplin Server
+
+Run:
+
+	npm run releaseServer
+
+## Web clipper
+
+Run:
+
+	npm run releaseClipper
+
+## Plugin generator
+
+First the types should generally be updated, using `./updateTypes.sh`. Then run:
+
+	npm run releasePluginGenerator
+
+## Plugin Repo Cli
+
+Since it has dependencies to the `@joplin` packages, it is released when running `npm run publishAll`

LICENSE

@@ -1,3 +1,15 @@
+All code in this repository is licensed under the MIT License **unless a
+directory contains a LICENSE file**, in which case that LICENSE file applies to
+the code in that sub-directory.
+
+For example, packages/fork-sax contains a ISC LICENSE file, thus all files
+under the packages/fork-sax directory are licensed under ISC.
+
+For example, packages/app-cli does NOT contain a LICENSE file, thus all files
+under that directory are licensed under the default license, which is MIT.
+
+* * *
+
 MIT License
 
 Copyright (c) 2016-2020 Laurent Cozic

README.md

@@ -22,11 +22,11 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
 
 Operating System | Download
 ---|---
-Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.7.11/Joplin-Setup-1.7.11.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a>
-macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.7.11/Joplin-1.7.11.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a>
-Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.7.11/Joplin-1.7.11.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a>
+Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.8.5/Joplin-Setup-1.8.5.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a>
+macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.8.5/Joplin-1.8.5.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a>
+Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.8.5/Joplin-1.8.5.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a>
 
-**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v1.7.11/JoplinPortable.exe'>Portable version</a>. 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.
+**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v1.8.5/JoplinPortable.exe'>Portable version</a>. 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.
 
 **On Linux**, the recommended way is to use the following installation script as it will handle the desktop icon too:
 
@@ -109,6 +109,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 	- [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)
+	- [Plugin theming](https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_theming.md)
 
 - Development
 
@@ -427,12 +428,13 @@ You can also use search filters to further restrict the search.
 | **title:** <br> **body:**|Restrict your search to just the title or the body field.|`title:"hello world"` searches for notes whose title contains `hello` and `world`.<br>`title:hello -body:world` searches for notes whose title contains `hello` and body does not contain `world`.
 | **tag:** |Restrict the search to the notes with the specified tags.|`tag:office` searches for all notes having tag office.<br>`tag:office tag:important` searches for all notes having both office and important tags.<br>`tag:office -tag:spam` searches for notes having tag `office` which do not have tag `spam`.<br>`any:1 tag:office tag:spam` searches for notes having tag `office` or tag `spam`.<br>`tag:be*ful` does a search with wildcards.<br>`tag:*` returns all notes with tags.<br>`-tag:*` returns all notes without tags.|
 | **notebook:** | Restrict the search to the specified notebook(s). |`notebook:books` limits the search scope within `books` and all its subnotebooks.<br>`notebook:wheel*time` does a wildcard search.|
-| **created:** <br> **updated:** | Searches for notes created/updated on dates specified using YYYYMMDD format. You can also search relative to the current day, week, month, or year. | `created:20201218` will return notes created on or after December 18, 2020.<br>`-updated:20201218` will return notes updated before December 18, 2020.<br>`created:20200118 -created:20201215` will return notes created between January 18, 2020, and before December 15, 2020.<br>`created:202001 -created:202003` will return notes created on or after January and before March 2020.<br>`updated:1997 -updated:2020` will return all notes updated between the years 1997 and 2019.<br>`created:day-2` searches for all notes created in the past two days.<br>`updated:year-0` searches all notes updated in the current year.
+| **created:** <br> **updated:** <br> **due:**| Searches for notes created/updated on dates specified using YYYYMMDD format. You can also search relative to the current day, week, month, or year. | `created:20201218` will return notes created on or after December 18, 2020.<br>`-updated:20201218` will return notes updated before December 18, 2020.<br>`created:20200118 -created:20201215` will return notes created between January 18, 2020, and before December 15, 2020.<br>`created:202001 -created:202003` will return notes created on or after January and before March 2020.<br>`updated:1997 -updated:2020` will return all notes updated between the years 1997 and 2019.<br>`created:day-2` searches for all notes created in the past two days.<br>`updated:year-0` searches all notes updated in the current year.<br>`-due:day+7` will return all todos which are due or will be due in the next seven days.<br>`-due:day-5` searches all todos that are overdue for more than 5 days.|
 | **type:** |Restrict the search to either notes or todos. | `type:note` to return all notes<br>`type:todo` to return all todos |
 | **iscompleted:** | Restrict the search to either completed or uncompleted todos. | `iscompleted:1` to return all completed todos<br>`iscompleted:0` to return all uncompleted todos|
 |**latitude:** <br> **longitude:** <br> **altitude:**|Filter by location|`latitude:40 -latitude:50` to return notes with latitude >= 40 and < 50  |
 |**resource:**|Filter by attachment MIME type|`resource:image/jpeg` to return notes with a jpeg attachment.<br>`-resource:application/pdf` to return notes without a pdf attachment.<br>`resource:image/*` to return notes with any images.|
 |**sourceurl:**|Filter by source URL|`sourceurl:https://www.google.com`<br>`sourceurl:*joplinapp.org` to perform a wildcard search.|
+|**id:**|Filter by note ID|`id:9cbc1b4f242043a9b8a50627508bccd5` return a note with the specified id |
 
 Note: In the CLI client you have to escape the query using `--` when using negated filters.
 Eg. `:search -- "-tag:tag1"`.
@@ -449,7 +451,7 @@ Notes are sorted by "relevance". Currently it means the notes that contain the r
 
 # Goto Anything
 
-In the desktop application, press <kbd>Ctrl+G</kbd> or <kbd>Cmd+G</kbd> and type a note title or part of its content to jump to it. Or type <kbd>#</kbd> followed by a tag name, or <kbd>@</kbd> followed by a notebook name.
+In the desktop application, press <kbd>Ctrl+P</kbd> or <kbd>Cmd+P</kbd> and type a note title or part of its content to jump to it. Or type <kbd>#</kbd> followed by a tag name, or <kbd>@</kbd> followed by a notebook name.
 
 # Privacy
 
@@ -509,47 +511,47 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-![](https://joplinapp.org/images/flags/country-4x3/arableague.png)  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell](mailto:Whaell@protonmail.com)  |  99%
+![](https://joplinapp.org/images/flags/country-4x3/arableague.png)  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  98%
 ![](https://joplinapp.org/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  31%
 ![](https://joplinapp.org/images/flags/country-4x3/ba.png)  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  76%
-![](https://joplinapp.org/images/flags/country-4x3/bg.png)  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  61%
-![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  jmontane, 2019  |  87%
-![](https://joplinapp.org/images/flags/country-4x3/hr.png)  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  100%
-![](https://joplinapp.org/images/flags/country-4x3/cz.png)  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Lukas Helebrandt](mailto:lukas@aiya.cz)  |  90%
-![](https://joplinapp.org/images/flags/country-4x3/dk.png)  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  75%
-![](https://joplinapp.org/images/flags/country-4x3/de.png)  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [Ettore Atalan](mailto:atalanttore@users.noreply.github.com)  |  93%
-![](https://joplinapp.org/images/flags/country-4x3/ee.png)  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  60%
+![](https://joplinapp.org/images/flags/country-4x3/bg.png)  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  59%
+![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  jmontane, 2019  |  84%
+![](https://joplinapp.org/images/flags/country-4x3/hr.png)  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  99%
+![](https://joplinapp.org/images/flags/country-4x3/cz.png)  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Lukas Helebrandt](mailto:lukas@aiya.cz)  |  88%
+![](https://joplinapp.org/images/flags/country-4x3/dk.png)  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  98%
+![](https://joplinapp.org/images/flags/country-4x3/de.png)  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [Atalanttore](mailto:atalanttore@googlemail.com)  |  98%
+![](https://joplinapp.org/images/flags/country-4x3/ee.png)  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  58%
 ![](https://joplinapp.org/images/flags/country-4x3/gb.png)  |  English (United Kingdom)  |  [en_GB](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po)  |    |  100%
 ![](https://joplinapp.org/images/flags/country-4x3/us.png)  |  English (United States of America)  |  [en_US](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po)  |    |  100%
-![](https://joplinapp.org/images/flags/country-4x3/es.png)  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Mario Campo](mailto:mario.campo@gmail.com)  |  99%
-![](https://joplinapp.org/images/flags/esperanto.png)  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  34%
-![](https://joplinapp.org/images/flags/country-4x3/fi.png)  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |    |  91%
-![](https://joplinapp.org/images/flags/country-4x3/fr.png)  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  97%
-![](https://joplinapp.org/images/flags/es/galicia.png)  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  40%
-![](https://joplinapp.org/images/flags/country-4x3/id.png)  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [Fathy AR](mailto:16875937+fathyar@users.noreply.github.com)  |  95%
-![](https://joplinapp.org/images/flags/country-4x3/it.png)  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Alessandro Bernardello](mailto:mailfilledwithspam@gmail.com)  |  94%
-![](https://joplinapp.org/images/flags/country-4x3/hu.png)  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Szőke Sándor](mailto:mail@szokesandor.hu)  |  93%
-![](https://joplinapp.org/images/flags/country-4x3/be.png)  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  97%
-![](https://joplinapp.org/images/flags/country-4x3/nl.png)  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  91%
-![](https://joplinapp.org/images/flags/country-4x3/no.png)  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  80%
-![](https://joplinapp.org/images/flags/country-4x3/ir.png)  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  75%
-![](https://joplinapp.org/images/flags/country-4x3/pl.png)  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [konhi](mailto:hello.konhi@gmail.com)  |  100%
-![](https://joplinapp.org/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Nicolas Suzuki](mailto:nicolas.suzuki@pm.me)  |  100%
-![](https://joplinapp.org/images/flags/country-4x3/pt.png)  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  100%
-![](https://joplinapp.org/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  70%
-![](https://joplinapp.org/images/flags/country-4x3/si.png)  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |    |  39%
-![](https://joplinapp.org/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  65%
-![](https://joplinapp.org/images/flags/country-4x3/th.png)  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  48%
-![](https://joplinapp.org/images/flags/country-4x3/vi.png)  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  77%
-![](https://joplinapp.org/images/flags/country-4x3/tr.png)  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  99%
-![](https://joplinapp.org/images/flags/country-4x3/ua.png)  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  100%
-![](https://joplinapp.org/images/flags/country-4x3/gr.png)  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  87%
-![](https://joplinapp.org/images/flags/country-4x3/ru.png)  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  99%
-![](https://joplinapp.org/images/flags/country-4x3/rs.png)  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  75%
-![](https://joplinapp.org/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [Yang Zhang](mailto:zyangmath@gmail.com)  |  99%
-![](https://joplinapp.org/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Yaoze Ye](mailto:yaozeye@yahoo.co.jp)  |  92%
-![](https://joplinapp.org/images/flags/country-4x3/jp.png)  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  99%
-![](https://joplinapp.org/images/flags/country-4x3/kr.png)  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  100%
+![](https://joplinapp.org/images/flags/country-4x3/es.png)  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Mario Campo](mailto:mario.campo@gmail.com)  |  97%
+![](https://joplinapp.org/images/flags/esperanto.png)  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  33%
+![](https://joplinapp.org/images/flags/country-4x3/fi.png)  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/fr.png)  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  94%
+![](https://joplinapp.org/images/flags/es/galicia.png)  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  39%
+![](https://joplinapp.org/images/flags/country-4x3/id.png)  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [eresytter](mailto:42007357+eresytter@users.noreply.github.com)  |  95%
+![](https://joplinapp.org/images/flags/country-4x3/it.png)  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Alessandro Bernardello](mailto:mailfilledwithspam@gmail.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/hu.png)  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Szőke Sándor](mailto:mail@szokesandor.hu)  |  90%
+![](https://joplinapp.org/images/flags/country-4x3/be.png)  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  94%
+![](https://joplinapp.org/images/flags/country-4x3/nl.png)  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/no.png)  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  78%
+![](https://joplinapp.org/images/flags/country-4x3/ir.png)  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  73%
+![](https://joplinapp.org/images/flags/country-4x3/pl.png)  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [konhi](mailto:hello.konhi@gmail.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Nicolas Suzuki](mailto:nicolas.suzuki@pm.me)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/pt.png)  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  68%
+![](https://joplinapp.org/images/flags/country-4x3/si.png)  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  98%
+![](https://joplinapp.org/images/flags/country-4x3/se.png)  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  63%
+![](https://joplinapp.org/images/flags/country-4x3/th.png)  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  46%
+![](https://joplinapp.org/images/flags/country-4x3/vi.png)  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  75%
+![](https://joplinapp.org/images/flags/country-4x3/tr.png)  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/ua.png)  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/gr.png)  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  84%
+![](https://joplinapp.org/images/flags/country-4x3/ru.png)  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/rs.png)  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  73%
+![](https://joplinapp.org/images/flags/country-4x3/cn.png)  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [Yang Zhang](mailto:zyangmath@gmail.com)  |  97%
+![](https://joplinapp.org/images/flags/country-4x3/tw.png)  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Yaoze Ye](mailto:yaozeye@yahoo.co.jp)  |  95%
+![](https://joplinapp.org/images/flags/country-4x3/jp.png)  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  98%
+![](https://joplinapp.org/images/flags/country-4x3/kr.png)  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  99%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Contributors

docs/api/get_started/plugins/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/api/overview/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/api/references/development_mode/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

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

@@ -99,6 +99,7 @@
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinsettings.html#onchange" class="tsd-kind-icon">on<wbr>Change</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinsettings.html#registersection" class="tsd-kind-icon">register<wbr>Section</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinsettings.html#registersetting" class="tsd-kind-icon">register<wbr>Setting</a></li>
+								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinsettings.html#registersettings" class="tsd-kind-icon">register<wbr>Settings</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinsettings.html#setvalue" class="tsd-kind-icon">set<wbr>Value</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinsettings.html#value" class="tsd-kind-icon">value</a></li>
 							</ul>
@@ -217,12 +218,12 @@
 							<aside class="tsd-sources">
 							</aside>
 							<div class="tsd-comment tsd-typography">
-								<div class="lead">
-									<p>Registers a new setting. Note that registering a setting item is dynamic and will be gone next time Joplin starts.
-										What it means is that you need to register the setting every time the plugin starts (for example in the onStart event).
-										The setting value however will be preserved from one launch to the next so there is no risk that it will be lost even if for some
-									reason the plugin fails to start at some point.</p>
-								</div>
+								<dl class="tsd-comment-tags">
+									<dt>deprecated</dt>
+									<dd><p>Use joplin.settings.registerSettings()</p>
+										<p>Registers a new setting.</p>
+									</dd>
+								</dl>
 							</div>
 							<h4 class="tsd-parameters-title">Parameters</h4>
 							<ul class="tsd-parameters">
@@ -237,6 +238,39 @@
     <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></h4>
 
 
+-->
+						</li>
+					</ul>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
+					<a name="registersettings" class="tsd-anchor"></a>
+					<h3>register<wbr>Settings</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon">register<wbr>Settings<span class="tsd-signature-symbol">(</span>settings<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Record</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">, </span><a href="../interfaces/settingitem.html" class="tsd-signature-type">SettingItem</a><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<div class="tsd-comment tsd-typography">
+								<div class="lead">
+									<p>Registers new settings.
+										Note that registering a setting item is dynamic and will be gone next time Joplin starts.
+										What it means is that you need to register the setting every time the plugin starts (for example in the onStart event).
+										The setting value however will be preserved from one launch to the next so there is no risk that it will be lost even if for some
+									reason the plugin fails to start at some point.</p>
+								</div>
+							</div>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>settings: <span class="tsd-signature-type">Record</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">, </span><a href="../interfaces/settingitem.html" class="tsd-signature-type">SettingItem</a><span class="tsd-signature-symbol">&gt;</span></h5>
+								</li>
+							</ul>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></h4>
+
+
 -->
 						</li>
 					</ul>
@@ -336,6 +370,9 @@
 							<li class=" tsd-kind-method tsd-parent-kind-class">
 								<a href="joplinsettings.html#registersetting" class="tsd-kind-icon">register<wbr>Setting</a>
 							</li>
+							<li class=" tsd-kind-method tsd-parent-kind-class">
+								<a href="joplinsettings.html#registersettings" class="tsd-kind-icon">register<wbr>Settings</a>
+							</li>
 							<li class=" tsd-kind-method tsd-parent-kind-class">
 								<a href="joplinsettings.html#setvalue" class="tsd-kind-icon">set<wbr>Value</a>
 							</li>

docs/api/references/plugin_loading_rules/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/api/references/plugin_manifest/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/api/references/plugin_theming/index.html

@@ -0,0 +1,481 @@
+<!doctype html>
+<html>
+
+<!--
+
+!!! WARNING !!!
+
+This file was auto-generated from readme/api/references/plugin_theming.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_theming.md
+
+-->
+
+<head>
+	<title>Plugin theming | 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%;
+		/* For GSoC: */
+		min-width: 470px;
+	}
+	.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_theming">
+
+<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="gsoc" href="https://joplinapp.org/gsoc2021/index/" title="Google Summer of Code 2021">GSoC 2021</a></li>
+		</ul>
+		<div class="nav-right">
+			<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="115px" 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/rich_text_editor/">About the Rich Text editor limitations</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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</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>
+<li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2021</p>
+<ul>
+<li><a href="https://joplinapp.org/gsoc2021/index/">Google Summer of Code 2021</a></li>
+<li><a href="https://joplinapp.org/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
+<li><a href="https://joplinapp.org/gsoc2021/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/changelog_server/">Changelog (Server)</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">
+<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 using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
+<hr>
+<h1>Plugin theming<a name="plugin-theming" href="#plugin-theming" class="heading-anchor">🔗</a></h1>
+<h2>CSS<a name="css" href="#css" class="heading-anchor">🔗</a></h2>
+<p>Plugins add custom content to the UI using<br>
+<a href="https://joplinapp.org/api/references/plugin_api/classes/joplinviewspanels.html">webview panels</a>.<br>
+The HTML content of a a panel is styled with CSS.</p>
+<p>To keep the look and feel of a plugin consistent with the rest of the Joplin UI,<br>
+you are automatically provided with variables derived from the current theme.</p>
+<p>Variables follow the naming convention <code>--joplin-{property}</code> and are used<br>
+in your plugin's stylesheet as shown here.</p>
+<pre><code class="language-css">/* webview.css */
+.container {
+	color: var(--joplin-color);
+	font-family: var(--joplin-font-family);
+}
+</code></pre>
+<h2>Icons<a name="icons" href="#icons" class="heading-anchor">🔗</a></h2>
+<p>In addition to variables, you have access to a set of standard font assets that ship with Joplin.<br>
+These include:</p>
+<ul>
+<li><a href="https://fonts.google.com/specimen/Roboto?preview.text_type=custom">Roboto</a> - (the standard UI font, <code>font-family</code> referenced above)</li>
+<li><a href="https://fontawesome.com/icons?d=gallery&amp;p=2&amp;m=free">Font Awesome</a> - icon library</li>
+<li><a href="https://icomoon.io/#preview-free">icoMoon</a> - icon library (subset, see <a href="https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/style/icons/style.css">style.css</a>)</li>
+</ul>
+<p>To display an icon, use CSS and HTML like the following.</p>
+<pre><code class="language-css">/* style icons to match the theme */
+.toolbarIcon {
+    font-size: var(--joplin-toolbar-icon-size);
+}
+.primary {
+    color: var(--joplin-color);
+}
+.secondary {
+    color: var(--joplin-color-2);
+}
+</code></pre>
+<pre><code class="language-html">&lt;i class=&quot;toolbarIcon primary fas fa-music&quot;&gt;&lt;/i&gt; Font Awesome music icon
+&lt;br /&gt;
+&lt;i class=&quot;toolbarIcon secondary icon-notebooks&quot;&gt;&lt;/i&gt; icoMoon notebook icon
+</code></pre>
+
+		<div class="bottom-links">
+			<a href="https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_theming.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');
+		}
+	}
+
+	$(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-2021 Laurent Cozic
+</div>
+</body>
+</html>

docs/api/references/rest_api/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/api/tutorials/toc_plugin/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -458,7 +459,7 @@ joplin.plugins.register({
 
 		// This event will be triggered when the content of the note changes
 		// as you also want to update the TOC in this case.
-		await joplin.workspace.onNoteContentChange(() =&gt; {
+		await joplin.workspace.onNoteChange(() =&gt; {
 			updateTocView();
 		});
 
@@ -541,7 +542,7 @@ function escapeHtml(unsafe:string) {
 
 	onStart: async function() {
 		// Create the panel object
-		const panel = await joplin.views.panels.create();
+		const panel = await joplin.views.panels.create('panel_1');
 
 		// Set some initial content while the TOC is being created
 		await joplin.views.panels.setHtml(panel, 'Loading...');
@@ -593,7 +594,7 @@ function escapeHtml(unsafe:string) {
 <p>Now run the plugin again and you should see the TOC dynamically updating as you change notes.</p>
 <h2>Styling the view<a name="styling-the-view" href="#styling-the-view" class="heading-anchor">🔗</a></h2>
 <p>In order to better integrate the TOC to Joplin, you might want to style it using CSS. To do so, first add a <code>webview.css</code> file next to <code>index.ts</code>, then you will need to let Joplin know about this file. This is done using the <code>addScript()</code> function (which is also used to add JavaScript files as we'll see later), like so:</p>
-<pre><code class="language-typescript">const panel = await joplin.views.panels.create();
+<pre><code class="language-typescript">const panel = await joplin.views.panels.create('panel_1');
  // Add the CSS file to the view, right after it has been created:
 await joplin.views.panels.addScript(panel, './webview.css');
 </code></pre>
@@ -617,8 +618,7 @@ await joplin.views.panels.addScript(panel, './webview.css');
 <h2>Making the webview interactive<a name="making-the-webview-interactive" href="#making-the-webview-interactive" class="heading-anchor">🔗</a></h2>
 <p>The next step is to make the TOC interactive so that when the user clicks on a link, the note is scrolled to right header. This can be done using an external JavaScript file that will handle the click events. As for the CSS file, create a <code>webview.js</code> file next to <code>index.ts</code>, then add the script to the webview:</p>
 <pre><code class="language-typescript">// In index.ts
-
-const panel = joplin.views.createWebviewPanel();
+const panel = await joplin.views.panels.create('panel_1');
 await joplin.views.panels.addScript(panel, './webview.css');
 await joplin.views.panels.addScript(panel, './webview.js'); // Add the JS file
 </code></pre>
@@ -657,7 +657,7 @@ document.addEventListener('click', event =&gt; {
 <p>Then from the plugin, in <code>src/index.ts</code>, you can listen to this message using the <code>onMessage()</code> handler. Then from this handler, you can call the <code>scrollToHash</code> command and pass it the slug (or hash).</p>
 <pre><code class="language-typescript">joplin.plugins.register({
 	onStart: async function() {
-		const panel = await joplin.views.panels.create();
+		const panel = await joplin.views.panels.create('panel_1');
 
 		// ...
 

docs/blog/20180621-182112/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180906-111039/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180916-210431/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20180929-121053/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20181004-091123/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20181101-174335/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20181213-173459/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190130-230218/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190404-074157/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190424-112410/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190523-231026/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190611-000711/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190613-202613/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190814-225957/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190925-000254/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20190929-152834/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191012-233121/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191014-165136/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191101-131852/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191117-183855/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20191118-072700/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200220-190804/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200301-125055/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200314-001555/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/blog/20200406-224254/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/build_troubleshooting/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/changelog_cli/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -404,6 +405,22 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <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 using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 <hr>
 <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.8.1">cli-v1.8.1</a> - 2021-05-10T09:38:05Z<a name="cli-v1-8-1-https-github-com-laurent22-joplin-releases-tag-cli-v1-8-1-2021-05-10t09-38-05z" href="#cli-v1-8-1-https-github-com-laurent22-joplin-releases-tag-cli-v1-8-1-2021-05-10t09-38-05z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add &quot;id&quot; and &quot;due&quot; search filters (#4898 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>New: Add support for &quot;batch&quot; command (eef86d6)</li>
+<li>Improved: Also duplicate the tags when the note is duplicated (#4876) (#3157 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>Improved: Bump KaTeX to 0.13.3 (#4902 by Roman Musin)</li>
+<li>Improved: Filter &quot;notebook&quot; can now be negated (#4651 by Naveen M V)</li>
+<li>Improved: Improved error handling when importing ENEX (257cde4)</li>
+<li>Improved: Save user settings to JSON file (71f976f)</li>
+<li>Improved: Some imported ENEX files incorrectly had invisible sections (f7a457f)</li>
+<li>Fixed: Disable WebDAV response caching (#4887) (#4706 by Roman Musin)</li>
+<li>Fixed: Fixed issue when getting version info (54884d6)</li>
+<li>Fixed: Fixed rendering of note and resource links (61399ce)</li>
+<li>Fixed: Regression: Fixed network request repeat mechanism (ede6004)</li>
+<li>Security: Apply npm audit security fixes (0b67446)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.6.4">cli-v1.6.4</a> - 2021-01-21T10:01:15Z<a name="cli-v1-6-4-https-github-com-laurent22-joplin-releases-tag-cli-v1-6-4-2021-01-21t10-01-15z" href="#cli-v1-6-4-https-github-com-laurent22-joplin-releases-tag-cli-v1-6-4-2021-01-21t10-01-15z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fixed infinite sync issue with OneDrive (#4305)</li>

docs/changelog_server/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/clipper/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/conflict/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/debugging/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/desktop/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/donate/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -436,7 +437,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <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>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>Vote for or review the app on <a href="https://alternativeto.net/software/joplin/about/">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>
 

docs/e2ee/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/faq/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -454,6 +455,13 @@ notepad++.exe --openSession   # Opens Notepad ++ in new window
 <p>You may use a special keyboard such as <a href="https://play.google.com/store/apps/details?id=kl.ime.oh&amp;hl=en">Multiling O Keyboard</a>, which has shortcuts to create Markdown tags. <a href="https://discourse.joplinapp.org/t/android-create-new-list-item-with-enter/585/2?u=laurent">More information in this post</a>.</p>
 <h2>The initial sync is very slow, how can I speed it up?<a name="the-initial-sync-is-very-slow-how-can-i-speed-it-up" href="#the-initial-sync-is-very-slow-how-can-i-speed-it-up" class="heading-anchor">🔗</a></h2>
 <p>Whenever importing a large number of notes, for example from Evernote, it may take a very long time for the first sync to complete. There are various techniques to speed thing up (if you don't want to simply wait for the sync to complete), which are outlined in <a href="https://discourse.joplinapp.org/t/workaround-for-slow-initial-bulk-sync-after-evernote-import/746?u=laurent">this post</a>.</p>
+<h2>Not all notes, folders, or tags are displayed on the mobile app<a name="not-all-notes-folders-or-tags-are-displayed-on-the-mobile-app" href="#not-all-notes-folders-or-tags-are-displayed-on-the-mobile-app" class="heading-anchor">🔗</a></h2>
+<p>Joplin does not have a background sync on mobile devices. When Joplin is closed, sent to the background or the device is put into sleep (display off), the sync is interrupted.</p>
+<h2>How can I check the sync status?<a name="how-can-i-check-the-sync-status" href="#how-can-i-check-the-sync-status" class="heading-anchor">🔗</a></h2>
+<p>Go to the synchronisation page. You can find it on the desktop application under <code>Help &gt; Synchronisation Status</code> and on the mobile app under <code>Configuration &gt; SYNC STATUS</code>.</p>
+<p><code>total items</code> = How many items there are in total to sync.<br>
+<code>synced items</code> = How many items have already been uploaded or downloaded.</p>
+<p>If <code>total items</code> and <code>synced items</code> are equal, all data has been synced. Also all devices should have the same <code>total items</code>.</p>
 <h2>Is it possible to use real file and folder names in the sync target?<a name="is-it-possible-to-use-real-file-and-folder-names-in-the-sync-target" href="#is-it-possible-to-use-real-file-and-folder-names-in-the-sync-target" class="heading-anchor">🔗</a></h2>
 <p>Unfortunately it is not possible. Joplin synchronises with file systems using an open format however it does not mean the sync files are meant to be user-editable. The format is designed to be performant and reliable, not user friendly (it cannot be both), and that cannot be changed. Joplin sync directory is basically just a database.</p>
 <h2>Could there be a password to restrict access to Joplin?<a name="could-there-be-a-password-to-restrict-access-to-joplin" href="#could-there-be-a-password-to-restrict-access-to-joplin" class="heading-anchor">🔗</a></h2>

docs/gsoc2020/ideas/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/gsoc2020/index/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/gsoc2021/ideas/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/gsoc2021/index/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/gsoc2021/pull_request_guidelines/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/gsod2020/ideas/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/gsod2020/index/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -839,9 +840,9 @@ Details:
 <td><code>notebook:books</code> limits the search scope within <code>books</code> and all its subnotebooks.<br><code>notebook:wheel*time</code> does a wildcard search.</td>
 </tr>
 <tr>
-<td><strong>created:</strong> <br> <strong>updated:</strong></td>
+<td><strong>created:</strong> <br> <strong>updated:</strong> <br> <strong>due:</strong></td>
 <td>Searches for notes created/updated on dates specified using YYYYMMDD format. You can also search relative to the current day, week, month, or year.</td>
-<td><code>created:20201218</code> will return notes created on or after December 18, 2020.<br><code>-updated:20201218</code> will return notes updated before December 18, 2020.<br><code>created:20200118 -created:20201215</code> will return notes created between January 18, 2020, and before December 15, 2020.<br><code>created:202001 -created:202003</code> will return notes created on or after January and before March 2020.<br><code>updated:1997 -updated:2020</code> will return all notes updated between the years 1997 and 2019.<br><code>created:day-2</code> searches for all notes created in the past two days.<br><code>updated:year-0</code> searches all notes updated in the current year.</td>
+<td><code>created:20201218</code> will return notes created on or after December 18, 2020.<br><code>-updated:20201218</code> will return notes updated before December 18, 2020.<br><code>created:20200118 -created:20201215</code> will return notes created between January 18, 2020, and before December 15, 2020.<br><code>created:202001 -created:202003</code> will return notes created on or after January and before March 2020.<br><code>updated:1997 -updated:2020</code> will return all notes updated between the years 1997 and 2019.<br><code>created:day-2</code> searches for all notes created in the past two days.<br><code>updated:year-0</code> searches all notes updated in the current year.<br><code>-due:day+7</code> will return all todos which are due or will be due in the next seven days.<br><code>-due:day-5</code> searches all todos that are overdue for more than 5 days.</td>
 </tr>
 <tr>
 <td><strong>type:</strong></td>
@@ -868,6 +869,11 @@ Details:
 <td>Filter by source URL</td>
 <td><code>sourceurl:https://www.google.com</code><br><code>sourceurl:*joplinapp.org</code> to perform a wildcard search.</td>
 </tr>
+<tr>
+<td><strong>id:</strong></td>
+<td>Filter by note ID</td>
+<td><code>id:9cbc1b4f242043a9b8a50627508bccd5</code> return a note with the specified id</td>
+</tr>
 </tbody>
 </table>
 <p>Note: In the CLI client you have to escape the query using <code>--</code> when using negated filters.<br>
@@ -881,7 +887,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <h2>Search order<a name="search-order" href="#search-order" class="heading-anchor">🔗</a></h2>
 <p>Notes are sorted by &quot;relevance&quot;. Currently it means the notes that contain the requested terms the most times are on top. For queries with multiple terms, it also matters how close to each other the terms are. This is a bit experimental so if you notice a search query that returns unexpected results, please report it in the forum, providing as many details as possible to replicate the issue.</p>
 <h1>Goto Anything<a name="goto-anything" href="#goto-anything" class="heading-anchor">🔗</a></h1>
-<p>In the desktop application, press <kbd>Ctrl+G</kbd> or <kbd>Cmd+G</kbd> and type a note title or part of its content to jump to it. Or type <kbd>#</kbd> followed by a tag name, or <kbd>@</kbd> followed by a notebook name.</p>
+<p>In the desktop application, press <kbd>Ctrl+P</kbd> or <kbd>Cmd+P</kbd> and type a note title or part of its content to jump to it. Or type <kbd>#</kbd> followed by a tag name, or <kbd>@</kbd> followed by a notebook name.</p>
 <h1>Privacy<a name="privacy" href="#privacy" class="heading-anchor">🔗</a></h1>
 <p>Joplin values your privacy and security by giving you complete control over your information and digital footprint.</p>
 <p>Joplin applications do not send any data to any service without your authorisation. Any data that Joplin saves, such as notes or images, are saved to your own device and you are free to delete this data at any time.</p>
@@ -982,7 +988,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" alt=""></td>
 <td>Arabic</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po">ar</a></td>
-<td><a href="mailto:Whaell@protonmail.com">Whaell</a></td>
+<td><a href="mailto:Whaell@protonmail.com">Whaell O</a></td>
 <td>99%</td>
 </tr>
 <tr>
@@ -997,56 +1003,56 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Bosnian (Bosna i Hercegovina)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po">bs_BA</a></td>
 <td><a href="mailto:dervis.t@pm.me">Derviš T.</a></td>
-<td>76%</td>
+<td>74%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/bg.png" alt=""></td>
 <td>Bulgarian (България)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po">bg_BG</a></td>
 <td></td>
-<td>61%</td>
+<td>60%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/catalonia.png" alt=""></td>
 <td>Catalan</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po">ca</a></td>
 <td>jmontane, 2019</td>
-<td>87%</td>
+<td>85%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hr.png" alt=""></td>
 <td>Croatian (Hrvatska)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po">hr_HR</a></td>
 <td><a href="mailto:mail@milotype.de">Milo Ivir</a></td>
-<td>100%</td>
+<td>99%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cz.png" alt=""></td>
 <td>Czech (Česká republika)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po">cs_CZ</a></td>
 <td><a href="mailto:lukas@aiya.cz">Lukas Helebrandt</a></td>
-<td>90%</td>
+<td>89%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/dk.png" alt=""></td>
 <td>Dansk (Danmark)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po">da_DK</a></td>
 <td>Mustafa Al-Dailemi (<a href="mailto:dailemi@hotmail.com">dailemi@hotmail.com</a>)Language-Team:</td>
-<td>75%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/de.png" alt=""></td>
 <td>Deutsch (Deutschland)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po">de_DE</a></td>
-<td><a href="mailto:atalanttore@users.noreply.github.com">Ettore Atalan</a></td>
-<td>93%</td>
+<td><a href="mailto:atalanttore@googlemail.com">Atalanttore</a></td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ee.png" alt=""></td>
 <td>Eesti Keel (Eesti)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po">et_EE</a></td>
 <td></td>
-<td>60%</td>
+<td>58%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gb.png" alt=""></td>
@@ -1067,7 +1073,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Español (España)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po">es_ES</a></td>
 <td><a href="mailto:mario.campo@gmail.com">Mario Campo</a></td>
-<td>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/esperanto.png" alt=""></td>
@@ -1080,190 +1086,190 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fi.png" alt=""></td>
 <td>Finnish (Suomi)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po">fi_FI</a></td>
-<td></td>
-<td>91%</td>
+<td>mrkaato</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fr.png" alt=""></td>
 <td>Français (France)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po">fr_FR</a></td>
 <td>Laurent Cozic</td>
-<td>97%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/galicia.png" alt=""></td>
 <td>Galician (España)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po">gl_ES</a></td>
 <td><a href="mailto:marcoslansgarza@gmail.com">Marcos Lans</a></td>
-<td>40%</td>
+<td>39%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/id.png" alt=""></td>
 <td>Indonesian (Indonesia)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po">id_ID</a></td>
-<td><a href="mailto:16875937+fathyar@users.noreply.github.com">Fathy AR</a></td>
-<td>95%</td>
+<td><a href="mailto:42007357+eresytter@users.noreply.github.com">eresytter</a></td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/it.png" alt=""></td>
 <td>Italiano (Italia)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po">it_IT</a></td>
 <td><a href="mailto:mailfilledwithspam@gmail.com">Alessandro Bernardello</a></td>
-<td>94%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hu.png" alt=""></td>
 <td>Magyar (Magyarország)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po">hu_HU</a></td>
 <td><a href="mailto:mail@szokesandor.hu">Szőke Sándor</a></td>
-<td>93%</td>
+<td>91%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/be.png" alt=""></td>
 <td>Nederlands (België, Belgique, Belgien)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po">nl_BE</a></td>
 <td></td>
-<td>97%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/nl.png" alt=""></td>
 <td>Nederlands (Nederland)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po">nl_NL</a></td>
 <td><a href="mailto:metbril@users.noreply.github.com">MetBril</a></td>
-<td>91%</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/no.png" alt=""></td>
 <td>Norwegian (Norge, Noreg)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po">nb_NO</a></td>
 <td><a href="mailto:code@mxe.no">Mats Estensen</a></td>
-<td>80%</td>
+<td>78%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ir.png" alt=""></td>
 <td>Persian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po">fa</a></td>
 <td><a href="mailto:kourox@protonmail.com">Kourosh Firoozbakht</a></td>
-<td>75%</td>
+<td>74%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pl.png" alt=""></td>
 <td>Polski (Polska)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po">pl_PL</a></td>
 <td><a href="mailto:hello.konhi@gmail.com">konhi</a></td>
-<td>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/br.png" alt=""></td>
 <td>Português (Brasil)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po">pt_BR</a></td>
 <td><a href="mailto:nicolas.suzuki@pm.me">Nicolas Suzuki</a></td>
-<td>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pt.png" alt=""></td>
 <td>Português (Portugal)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po">pt_PT</a></td>
 <td><a href="mailto:dcaveiro@yahoo.com">Diogo Caveiro</a></td>
-<td>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ro.png" alt=""></td>
 <td>Română</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po">ro</a></td>
 <td><a href="mailto:cristi.duluta@gmail.com">Cristi Duluta</a></td>
-<td>70%</td>
+<td>68%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/si.png" alt=""></td>
 <td>Slovenian (Slovenija)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po">sl_SI</a></td>
-<td></td>
-<td>39%</td>
+<td><a href="mailto:martin.korelic@protonmail.com">Martin Korelič</a></td>
+<td>99%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/se.png" alt=""></td>
 <td>Svenska</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po">sv</a></td>
 <td><a href="mailto:jonatan@autistici.org">Jonatan Nyberg</a></td>
-<td>65%</td>
+<td>63%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/th.png" alt=""></td>
 <td>Thai (ประเทศไทย)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po">th_TH</a></td>
 <td></td>
-<td>48%</td>
+<td>47%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/vi.png" alt=""></td>
 <td>Tiếng Việt</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po">vi</a></td>
 <td></td>
-<td>77%</td>
+<td>75%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tr.png" alt=""></td>
 <td>Türkçe (Türkiye)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po">tr_TR</a></td>
 <td><a href="mailto:arda@kilicdagi.com">Arda Kılıçdağı</a></td>
-<td>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ua.png" alt=""></td>
 <td>Ukrainian (Україна)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po">uk_UA</a></td>
 <td><a href="mailto:vandreykiv@gmail.com">Vyacheslav Andreykiv</a></td>
-<td>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gr.png" alt=""></td>
 <td>Ελληνικά (Ελλάδα)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po">el_GR</a></td>
 <td><a href="mailto:xaris@tuta.io">Harris Arvanitis</a></td>
-<td>87%</td>
+<td>85%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ru.png" alt=""></td>
 <td>Русский (Россия)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po">ru_RU</a></td>
 <td><a href="mailto:thesermanarm@gmail.com">Sergey Segeda</a></td>
-<td>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/rs.png" alt=""></td>
 <td>српски језик (Србија)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po">sr_RS</a></td>
 <td></td>
-<td>75%</td>
+<td>73%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cn.png" alt=""></td>
 <td>中文 (简体)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po">zh_CN</a></td>
 <td><a href="mailto:zyangmath@gmail.com">Yang Zhang</a></td>
-<td>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tw.png" alt=""></td>
 <td>中文 (繁體)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po">zh_TW</a></td>
 <td><a href="mailto:yaozeye@yahoo.co.jp">Yaoze Ye</a></td>
-<td>92%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/jp.png" alt=""></td>
 <td>日本語 (日本)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po">ja_JP</a></td>
 <td><a href="mailto:genneko217@gmail.com">genneko</a></td>
-<td>99%</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/kr.png" alt=""></td>
 <td>한국어</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po">ko</a></td>
 <td><a href="mailto:potatogim@potatogim.net">Ji-Hyeon Gim</a></td>
-<td>100%</td>
+<td>97%</td>
 </tr>
 </tbody>
 </table>

docs/markdown/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/mobile/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/nextcloud_app/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/note_history/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/plugins/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/prereleases/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/privacy/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/rich_text_editor/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/schema/settings.json

@@ -33,6 +33,11 @@
 			"default": 0,
 			"$comment": "private"
 		},
+		"sync.startupOperation": {
+			"type": "integer",
+			"default": 0,
+			"$comment": "private"
+		},
 		"sync.2.path": {
 			"type": "string",
 			"default": "",
@@ -273,7 +278,8 @@
 				"MM/DD/YY",
 				"YYYY-MM-DD",
 				"DD.MM.YYYY",
-				"YYYY.MM.DD"
+				"YYYY.MM.DD",
+				"YYMMDD"
 			]
 		},
 		"timeFormat": {
@@ -613,7 +619,12 @@
 		"style.editor.fontFamily": {
 			"type": "string",
 			"default": "",
-			"description": "Editor font family. This should be a *monospace* font or some elements will render incorrectly. If the font is incorrect or empty, it will default to a generic monospace font."
+			"description": "Editor font family. Used for most text in the markdown editor. If not found, a generic proportional (variable width) font is used."
+		},
+		"style.editor.monospaceFontFamily": {
+			"type": "string",
+			"default": "",
+			"description": "Editor monospace font family. Used where a fixed width font is needed to lay out text legibly (e.g. tables, checkboxes, code). If not found, a generic monospace (fixed width) font is used."
 		},
 		"ui.layout": {
 			"type": "object",
@@ -649,6 +660,11 @@
 				86400
 			]
 		},
+		"sync.mobileWifiOnly": {
+			"type": "boolean",
+			"default": false,
+			"description": "Synchronise only over WiFi connection"
+		},
 		"noteVisiblePanes": {
 			"type": "array",
 			"default": [
@@ -710,6 +726,12 @@
 			"description": "Enable spell checking in Markdown editor? (WARNING BETA feature). Spell checker in the Markdown editor was previously unstable (cursor location was not stable, sometimes edits would not be saved or reflected in the viewer, etc.) however it appears to be more reliable now. If you notice any issue, please report it on GitHub or the Joplin Forum (Help -> Joplin Forum)",
 			"$comment": "private"
 		},
+		"image.noresizing": {
+			"type": "boolean",
+			"default": false,
+			"description": "Do not resize images",
+			"$comment": "private"
+		},
 		"net.customCertificates": {
 			"type": "string",
 			"default": "",
@@ -828,6 +850,11 @@
 			"type": "integer",
 			"default": 2,
 			"description": "Note area growth factor. The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes."
+		},
+		"isSafeMode": {
+			"type": "boolean",
+			"default": false,
+			"$comment": "private"
 		}
 	}
 }

docs/spec/e2ee/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/spec/history/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/spec/plugins/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/spec/search_sorting/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/spec/server_delta_sync/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/spec/server_file_url_format/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_file_url_format.
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/spec/server_sharing/index.html

@@ -5,11 +5,11 @@
 
 !!! WARNING !!!
 
-This file was auto-generated from readme/spec/server_delta_sharing.md and any manual change
+This file was auto-generated from readme/spec/server_sharing.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/spec/server_delta_sharing.md
+https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md
 
 -->
 
@@ -304,7 +304,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sharing.md
 
 <body>
 
-<div class="container root page-server_delta_sharing">
+<div class="container root page-server_sharing">
 
 <div class="header">
 	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sharing.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -429,7 +430,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sharing.md
 <p>TBD</p>
 
 		<div class="bottom-links">
-			<a href="https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sharing.md">
+			<a href="https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md">
 				<i class="fa fa-github"></i> Improve this doc
 			</a>
 		</div>

docs/spec/sync_lock/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/terminal/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/terminal.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -831,7 +832,8 @@ Possible keys/values:
                                    DD/MM/YY (30/01/17), MM/DD/YYYY
                                    (01/30/2017), MM/DD/YY (01/30/17),
                                    YYYY-MM-DD (2017-01-30), DD.MM.YYYY
-                                   (30.01.2017), YYYY.MM.DD (2017.01.30).
+                                   (30.01.2017), YYYY.MM.DD (2017.01.30),
+                                   YYMMDD (170130).
                                    Default: &quot;DD/MM/YYYY&quot;
 
     timeFormat                     Time format.

docs/welcome/1_welcome_to_joplin/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/1_welcome_to_joplin.
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -404,7 +405,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/1_welcome_to_joplin.
 <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 using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 <hr>
 <h1>Welcome to Joplin! 🗒️<a name="welcome-to-joplin" href="#welcome-to-joplin" class="heading-anchor">🔗</a></h1>
-<p>Joplin is a free, open source note taking and to-do application, which helps you write and organise your notes, and synchronise them between your devices. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in <a href="https://joplinapp.org/#markdown">Markdown format</a>. Joplin is available as a <strong>💻 desktop</strong>, <strong>📱 mobile</strong> and <strong>🔡 terminal</strong> application.</p>
+<p>Joplin is a free, open source note taking and to-do application, which helps you write and organise your notes, and synchronise them between your devices. The notes are searchable, can be copied, tagged and modified either from the application directly or from your own text editor. The notes are in <a href="https://joplinapp.org/#markdown">Markdown format</a>. Joplin is available as a <strong>💻 desktop</strong>, <strong>📱 mobile</strong> and <strong>🔡 terminal</strong> application.</p>
 <p>The notes in this notebook give an overview of what Joplin can do and how to use it. In general, the three applications share roughly the same functionalities; any differences will be clearly indicated.</p>
 <p><img src="./AllClients.png" alt=""></p>
 <h2>Joplin is divided into three parts<a name="joplin-is-divided-into-three-parts" href="#joplin-is-divided-into-three-parts" class="heading-anchor">🔗</a></h2>

docs/welcome/2_importing_and_exporting_notes/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/2_importing_and_expo
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/welcome/3_synchronising_your_notes/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/3_synchronising_your
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/welcome/4_tips/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/4_tips.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

docs/welcome/5_privacy/index.html

@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/5_privacy.md
 <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>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>

package.json

@@ -7,6 +7,7 @@
   },
   "license": "MIT",
   "scripts": {
+    "audit": "lerna-audit",
     "bootstrap": "lerna bootstrap --no-ci",
     "bootstrapIgnoreScripts": "lerna bootstrap --ignore-scripts --no-ci",
     "bootstrapServerOnly": "lerna bootstrap --no-ci --include-dependents --include-dependencies --scope @joplin/server",
@@ -62,8 +63,9 @@
     "gulp": "^4.0.2",
     "husky": "^3.0.2",
     "lerna": "^3.22.1",
+    "lerna-audit": "^1.3.2",
     "lint-staged": "^9.2.1",
-    "madge": "^4.0.0",
+    "madge": "^4.0.2",
     "typedoc": "^0.17.8",
     "typescript": "^4.0.5"
   }

packages/app-cli/app/app.js

@@ -9,6 +9,7 @@ const Tag = require('@joplin/lib/models/Tag').default;
 const Setting = require('@joplin/lib/models/Setting').default;
 const { reg } = require('@joplin/lib/registry.js');
 const { fileExtension } = require('@joplin/lib/path-utils');
+const { splitCommandString } = require('@joplin/lib/string-utils');
 const { _ } = require('@joplin/lib/locale');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');
@@ -386,6 +387,21 @@ class Application extends BaseApplication {
 		return output;
 	}
 
+	async commandList(argv) {
+		if (argv.length && argv[0] === 'batch') {
+			const commands = [];
+			const commandLines = (await fs.readFile(argv[1], 'utf-8')).split('\n');
+			for (const commandLine of commandLines) {
+				if (!commandLine.trim()) continue;
+				const splitted = splitCommandString(commandLine.trim());
+				commands.push(splitted);
+			}
+			return commands;
+		} else {
+			return [argv];
+		}
+	}
+
 	async start(argv) {
 		argv = await super.start(argv);
 
@@ -403,7 +419,10 @@ class Application extends BaseApplication {
 			await this.applySettingsSideEffects();
 
 			try {
-				await this.execCommand(argv);
+				const commands = await this.commandList(argv);
+				for (const command of commands) {
+					await this.execCommand(command);
+				}
 			} catch (error) {
 				if (this.showStackTraces_) {
 					console.error(error);

packages/app-cli/app/command-batch.js

@@ -0,0 +1,19 @@
+const { BaseCommand } = require('./base-command.js');
+const { _ } = require('@joplin/lib/locale');
+
+class Command extends BaseCommand {
+	usage() {
+		return 'batch <file-path>';
+	}
+
+	description() {
+		return _('Runs the commands contained in the text file. There should be one command per line.');
+	}
+
+	async action() {
+		// Implementation is in app.js::commandList()
+		throw new Error('No implemented');
+	}
+}
+
+module.exports = Command;

packages/app-cli/app/main.js

@@ -59,7 +59,12 @@ try {
 	keytar = null;
 }
 
-shimInit(sharp, keytar);
+function appVersion() {
+	const p = require('./package.json');
+	return p.version;
+}
+
+shimInit(sharp, keytar, null, appVersion);
 
 const application = app();
 

packages/app-cli/jest.config.js

@@ -35,7 +35,6 @@ module.exports = {
 		'<rootDir>/build/',
 		'<rootDir>/tests/test-utils.js',
 		'<rootDir>/tests/test-utils-synchronizer.js',
-		'<rootDir>/tests/file_api_driver.js',
 		'<rootDir>/tests/tmp/',
 		'<rootDir>/tests/test data/',
 	],

packages/app-cli/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4074,9 +4074,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "html-encoding-sniffer": {
@@ -4170,9 +4170,9 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
     "interpret": {
       "version": "1.2.0",
@@ -4666,8 +4666,7 @@
         },
         "y18n": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "resolved": "",
           "dev": true
         },
         "yargs": {
@@ -5464,9 +5463,9 @@
           }
         },
         "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
           "dev": true
         },
         "yargs": {
@@ -5989,9 +5988,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
     "lodash.sortby": {
@@ -7023,9 +7022,9 @@
       "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
     },
     "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
     },
     "rc": {
       "version": "1.2.8",
@@ -8587,9 +8586,9 @@
       }
     },
     "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"

packages/app-cli/package.json

@@ -31,7 +31,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.8.0",
+  "version": "1.8.1",
   "bin": {
     "joplin": "./main.js"
   },
@@ -39,8 +39,8 @@
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "^1.7.3",
-    "@joplin/renderer": "^1.7.3",
+    "@joplin/lib": "1.8",
+    "@joplin/renderer": "1.8",
     "aws-sdk": "^2.588.0",
     "chalk": "^4.1.0",
     "clean-html": "^1.5.0",
@@ -65,7 +65,7 @@
     "yargs-parser": "^7.0.0"
   },
   "devDependencies": {
-    "@joplin/tools": "^1.0.9",
+    "@joplin/tools": "1.8",
     "@types/fs-extra": "^9.0.6",
     "@types/jest": "^26.0.15",
     "@types/node": "^14.14.6",

packages/app-cli/tests/HtmlToMd.ts

@@ -1,7 +1,7 @@
 import shim from '@joplin/lib/shim';
 const os = require('os');
 const { filename } = require('@joplin/lib/path-utils');
-const HtmlToMd = require('@joplin/lib/HtmlToMd');
+import HtmlToMd from '@joplin/lib/HtmlToMd';
 
 describe('HtmlToMd', function() {
 

packages/app-cli/tests/Synchronizer.e2ee.ts

@@ -9,6 +9,7 @@ import Resource from '@joplin/lib/models/Resource';
 import ResourceFetcher from '@joplin/lib/services/ResourceFetcher';
 import MasterKey from '@joplin/lib/models/MasterKey';
 import BaseItem from '@joplin/lib/models/BaseItem';
+import { createFolderTree } from './test-utils';
 
 let insideBeforeEach = false;
 
@@ -361,13 +362,26 @@ describe('Synchronizer.e2ee', function() {
 		expect((await decryptionWorker().decryptionDisabledItems()).length).toBe(0);
 	}));
 
-	it('should not encrypt notes that are shared', (async () => {
+	it('should not encrypt notes that are shared by link', (async () => {
 		Setting.setValue('encryption.enabled', true);
 		await loadEncryptionMasterKey();
 
-		const folder1 = await Folder.save({ title: 'folder1' });
-		const note1 = await Note.save({ title: 'un', parent_id: folder1.id });
-		let note2 = await Note.save({ title: 'deux', parent_id: folder1.id });
+		await createFolderTree('', [
+			{
+				title: 'folder1',
+				children: [
+					{
+						title: 'un',
+					},
+					{
+						title: 'deux',
+					},
+				],
+			},
+		]);
+
+		const note1 = await Note.loadByTitle('un');
+		let note2 = await Note.loadByTitle('deux');
 		await synchronizerStart();
 
 		await switchClient(2);
@@ -400,4 +414,61 @@ describe('Synchronizer.e2ee', function() {
 		expect(note1_2.title).toBe('');
 	}));
 
+	it('should not encrypt items that are shared by folder', (async () => {
+		Setting.setValue('encryption.enabled', true);
+		await loadEncryptionMasterKey();
+
+		const folder1 = await createFolderTree('', [
+			{
+				title: 'folder1',
+				children: [
+					{
+						title: 'note1',
+					},
+				],
+			},
+			{
+				title: 'folder2',
+				children: [
+					{
+						title: 'note2',
+					},
+				],
+			},
+		]);
+
+		await synchronizerStart();
+
+		await switchClient(2);
+
+		await synchronizerStart();
+
+		await switchClient(1);
+
+		// Simulate that the folder has been shared
+		await Folder.save({ id: folder1.id, share_id: 'abcd' });
+
+		await synchronizerStart();
+
+		await switchClient(2);
+
+		await synchronizerStart();
+
+		// The shared items should be decrypted
+		{
+			const folder1 = await Folder.loadByTitle('folder1');
+			const note1 = await Note.loadByTitle('note1');
+			expect(folder1.title).toBe('folder1');
+			expect(note1.title).toBe('note1');
+		}
+
+		// The non-shared items should be encrypted
+		{
+			const folder2 = await Folder.loadByTitle('folder2');
+			const note2 = await Note.loadByTitle('note2');
+			expect(folder2).toBeFalsy();
+			expect(note2).toBeFalsy();
+		}
+	}));
+
 });

packages/app-cli/tests/Synchronizer.share.js

@@ -0,0 +1,290 @@
+'use strict';
+const __awaiter = (this && this.__awaiter) || function(thisArg, _arguments, P, generator) {
+	function adopt(value) { return value instanceof P ? value : new P(function(resolve) { resolve(value); }); }
+	return new (P || (P = Promise))(function(resolve, reject) {
+		function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+		function rejected(value) { try { step(generator['throw'](value)); } catch (e) { reject(e); } }
+		function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+		step((generator = generator.apply(thisArg, _arguments || [])).next());
+	});
+};
+Object.defineProperty(exports, '__esModule', { value: true });
+const Setting_1 = require('@joplin/lib/models/Setting');
+const test_utils_synchronizer_1 = require('./test-utils-synchronizer');
+const { syncTargetName, afterAllCleanUp, synchronizerStart, setupDatabaseAndSynchronizer, synchronizer, sleep, switchClient, syncTargetId, fileApi } = require('./test-utils.js');
+const Folder_1 = require('@joplin/lib/models/Folder');
+const Note_1 = require('@joplin/lib/models/Note');
+const BaseItem_1 = require('@joplin/lib/models/BaseItem');
+const WelcomeUtils = require('@joplin/lib/WelcomeUtils');
+describe('Synchronizer.basics', function() {
+	beforeEach((done) => __awaiter(this, void 0, void 0, function* () {
+		yield setupDatabaseAndSynchronizer(1);
+		yield setupDatabaseAndSynchronizer(2);
+		yield switchClient(1);
+		done();
+	}));
+	afterAll(() => __awaiter(this, void 0, void 0, function* () {
+		yield afterAllCleanUp();
+	}));
+	it('should create remote items', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder = yield Folder_1.default.save({ title: 'folder1' });
+		yield Note_1.default.save({ title: 'un', parent_id: folder.id });
+		const all = yield test_utils_synchronizer_1.allNotesFolders();
+		yield synchronizerStart();
+		yield test_utils_synchronizer_1.localNotesFoldersSameAsRemote(all, expect);
+	})));
+	it('should update remote items', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder = yield Folder_1.default.save({ title: 'folder1' });
+		const note = yield Note_1.default.save({ title: 'un', parent_id: folder.id });
+		yield synchronizerStart();
+		yield Note_1.default.save({ title: 'un UPDATE', id: note.id });
+		const all = yield test_utils_synchronizer_1.allNotesFolders();
+		yield synchronizerStart();
+		yield test_utils_synchronizer_1.localNotesFoldersSameAsRemote(all, expect);
+	})));
+	it('should create local items', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder = yield Folder_1.default.save({ title: 'folder1' });
+		yield Note_1.default.save({ title: 'un', parent_id: folder.id });
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		const all = yield test_utils_synchronizer_1.allNotesFolders();
+		yield test_utils_synchronizer_1.localNotesFoldersSameAsRemote(all, expect);
+	})));
+	it('should update local items', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder1 = yield Folder_1.default.save({ title: 'folder1' });
+		const note1 = yield Note_1.default.save({ title: 'un', parent_id: folder1.id });
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		yield sleep(0.1);
+		let note2 = yield Note_1.default.load(note1.id);
+		note2.title = 'Updated on client 2';
+		yield Note_1.default.save(note2);
+		note2 = yield Note_1.default.load(note2.id);
+		yield synchronizerStart();
+		yield switchClient(1);
+		yield synchronizerStart();
+		const all = yield test_utils_synchronizer_1.allNotesFolders();
+		yield test_utils_synchronizer_1.localNotesFoldersSameAsRemote(all, expect);
+	})));
+	it('should delete remote notes', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder1 = yield Folder_1.default.save({ title: 'folder1' });
+		const note1 = yield Note_1.default.save({ title: 'un', parent_id: folder1.id });
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		yield sleep(0.1);
+		yield Note_1.default.delete(note1.id);
+		yield synchronizerStart();
+		const remotes = yield test_utils_synchronizer_1.remoteNotesAndFolders();
+		expect(remotes.length).toBe(1);
+		expect(remotes[0].id).toBe(folder1.id);
+		const deletedItems = yield BaseItem_1.default.deletedItems(syncTargetId());
+		expect(deletedItems.length).toBe(0);
+	})));
+	it('should not created deleted_items entries for items deleted via sync', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder1 = yield Folder_1.default.save({ title: 'folder1' });
+		yield Note_1.default.save({ title: 'un', parent_id: folder1.id });
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		yield Folder_1.default.delete(folder1.id);
+		yield synchronizerStart();
+		yield switchClient(1);
+		yield synchronizerStart();
+		const deletedItems = yield BaseItem_1.default.deletedItems(syncTargetId());
+		expect(deletedItems.length).toBe(0);
+	})));
+	it('should delete local notes', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder1 = yield Folder_1.default.save({ title: 'folder1' });
+		const note1 = yield Note_1.default.save({ title: 'un', parent_id: folder1.id });
+		const note2 = yield Note_1.default.save({ title: 'deux', parent_id: folder1.id });
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		yield Note_1.default.delete(note1.id);
+		yield synchronizerStart();
+		yield switchClient(1);
+		yield synchronizerStart();
+		const items = yield test_utils_synchronizer_1.allNotesFolders();
+		expect(items.length).toBe(2);
+		const deletedItems = yield BaseItem_1.default.deletedItems(syncTargetId());
+		expect(deletedItems.length).toBe(0);
+		yield Note_1.default.delete(note2.id);
+		yield synchronizerStart();
+	})));
+	it('should delete remote folder', (() => __awaiter(this, void 0, void 0, function* () {
+		yield Folder_1.default.save({ title: 'folder1' });
+		const folder2 = yield Folder_1.default.save({ title: 'folder2' });
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		yield sleep(0.1);
+		yield Folder_1.default.delete(folder2.id);
+		yield synchronizerStart();
+		const all = yield test_utils_synchronizer_1.allNotesFolders();
+		yield test_utils_synchronizer_1.localNotesFoldersSameAsRemote(all, expect);
+	})));
+	it('should delete local folder', (() => __awaiter(this, void 0, void 0, function* () {
+		yield Folder_1.default.save({ title: 'folder1' });
+		const folder2 = yield Folder_1.default.save({ title: 'folder2' });
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		yield Folder_1.default.delete(folder2.id);
+		yield synchronizerStart();
+		yield switchClient(1);
+		yield synchronizerStart();
+		const items = yield test_utils_synchronizer_1.allNotesFolders();
+		yield test_utils_synchronizer_1.localNotesFoldersSameAsRemote(items, expect);
+	})));
+	it('should cross delete all folders', (() => __awaiter(this, void 0, void 0, function* () {
+		// If client1 and 2 have two folders, client 1 deletes item 1 and client
+		// 2 deletes item 2, they should both end up with no items after sync.
+		const folder1 = yield Folder_1.default.save({ title: 'folder1' });
+		const folder2 = yield Folder_1.default.save({ title: 'folder2' });
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		yield sleep(0.1);
+		yield Folder_1.default.delete(folder1.id);
+		yield switchClient(1);
+		yield Folder_1.default.delete(folder2.id);
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		const items2 = yield test_utils_synchronizer_1.allNotesFolders();
+		yield switchClient(1);
+		yield synchronizerStart();
+		const items1 = yield test_utils_synchronizer_1.allNotesFolders();
+		expect(items1.length).toBe(0);
+		expect(items1.length).toBe(items2.length);
+	})));
+	it('items should be downloaded again when user cancels in the middle of delta operation', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder1 = yield Folder_1.default.save({ title: 'folder1' });
+		yield Note_1.default.save({ title: 'un', is_todo: 1, parent_id: folder1.id });
+		yield synchronizerStart();
+		yield switchClient(2);
+		synchronizer().testingHooks_ = ['cancelDeltaLoop2'];
+		yield synchronizerStart();
+		let notes = yield Note_1.default.all();
+		expect(notes.length).toBe(0);
+		synchronizer().testingHooks_ = [];
+		yield synchronizerStart();
+		notes = yield Note_1.default.all();
+		expect(notes.length).toBe(1);
+	})));
+	it('should skip items that cannot be synced', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder1 = yield Folder_1.default.save({ title: 'folder1' });
+		const note1 = yield Note_1.default.save({ title: 'un', is_todo: 1, parent_id: folder1.id });
+		const noteId = note1.id;
+		yield synchronizerStart();
+		let disabledItems = yield BaseItem_1.default.syncDisabledItems(syncTargetId());
+		expect(disabledItems.length).toBe(0);
+		yield Note_1.default.save({ id: noteId, title: 'un mod' });
+		synchronizer().testingHooks_ = ['notesRejectedByTarget'];
+		yield synchronizerStart();
+		synchronizer().testingHooks_ = [];
+		yield synchronizerStart(); // Another sync to check that this item is now excluded from sync
+		yield switchClient(2);
+		yield synchronizerStart();
+		const notes = yield Note_1.default.all();
+		expect(notes.length).toBe(1);
+		expect(notes[0].title).toBe('un');
+		yield switchClient(1);
+		disabledItems = yield BaseItem_1.default.syncDisabledItems(syncTargetId());
+		expect(disabledItems.length).toBe(1);
+	})));
+	it('should allow duplicate folder titles', (() => __awaiter(this, void 0, void 0, function* () {
+		yield Folder_1.default.save({ title: 'folder' });
+		yield switchClient(2);
+		let remoteF2 = yield Folder_1.default.save({ title: 'folder' });
+		yield synchronizerStart();
+		yield switchClient(1);
+		yield sleep(0.1);
+		yield synchronizerStart();
+		const localF2 = yield Folder_1.default.load(remoteF2.id);
+		expect(localF2.title == remoteF2.title).toBe(true);
+		// Then that folder that has been renamed locally should be set in such a way
+		// that synchronizing it applies the title change remotely, and that new title
+		// should be retrieved by client 2.
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield sleep(0.1);
+		yield synchronizerStart();
+		remoteF2 = yield Folder_1.default.load(remoteF2.id);
+		expect(remoteF2.title == localF2.title).toBe(true);
+	})));
+	it('should create remote items with UTF-8 content', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder = yield Folder_1.default.save({ title: 'Fahrräder' });
+		yield Note_1.default.save({ title: 'Fahrräder', body: 'Fahrräder', parent_id: folder.id });
+		const all = yield test_utils_synchronizer_1.allNotesFolders();
+		yield synchronizerStart();
+		yield test_utils_synchronizer_1.localNotesFoldersSameAsRemote(all, expect);
+	})));
+	it('should update remote items but not pull remote changes', (() => __awaiter(this, void 0, void 0, function* () {
+		const folder = yield Folder_1.default.save({ title: 'folder1' });
+		const note = yield Note_1.default.save({ title: 'un', parent_id: folder.id });
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield synchronizerStart();
+		yield Note_1.default.save({ title: 'deux', parent_id: folder.id });
+		yield synchronizerStart();
+		yield switchClient(1);
+		yield Note_1.default.save({ title: 'un UPDATE', id: note.id });
+		yield synchronizerStart(null, { syncSteps: ['update_remote'] });
+		const all = yield test_utils_synchronizer_1.allNotesFolders();
+		expect(all.length).toBe(2);
+		yield switchClient(2);
+		yield synchronizerStart();
+		const note2 = yield Note_1.default.load(note.id);
+		expect(note2.title).toBe('un UPDATE');
+	})));
+	it('should create a new Welcome notebook on each client', (() => __awaiter(this, void 0, void 0, function* () {
+		// Create the Welcome items on two separate clients
+		yield WelcomeUtils.createWelcomeItems();
+		yield synchronizerStart();
+		yield switchClient(2);
+		yield WelcomeUtils.createWelcomeItems();
+		const beforeFolderCount = (yield Folder_1.default.all()).length;
+		const beforeNoteCount = (yield Note_1.default.all()).length;
+		expect(beforeFolderCount === 1).toBe(true);
+		expect(beforeNoteCount > 1).toBe(true);
+		yield synchronizerStart();
+		const afterFolderCount = (yield Folder_1.default.all()).length;
+		const afterNoteCount = (yield Note_1.default.all()).length;
+		expect(afterFolderCount).toBe(beforeFolderCount * 2);
+		expect(afterNoteCount).toBe(beforeNoteCount * 2);
+		// Changes to the Welcome items should be synced to all clients
+		const f1 = (yield Folder_1.default.all())[0];
+		yield Folder_1.default.save({ id: f1.id, title: 'Welcome MOD' });
+		yield synchronizerStart();
+		yield switchClient(1);
+		yield synchronizerStart();
+		const f1_1 = yield Folder_1.default.load(f1.id);
+		expect(f1_1.title).toBe('Welcome MOD');
+	})));
+	it('should not wipe out user data when syncing with an empty target', (() => __awaiter(this, void 0, void 0, function* () {
+		// Only these targets support the wipeOutFailSafe flag (in other words, the targets that use basicDelta)
+		if (!['nextcloud', 'memory', 'filesystem', 'amazon_s3'].includes(syncTargetName())) { return; }
+		for (let i = 0; i < 10; i++) { yield Note_1.default.save({ title: 'note' }); }
+		Setting_1.default.setValue('sync.wipeOutFailSafe', true);
+		yield synchronizerStart();
+		yield fileApi().clearRoot(); // oops
+		yield synchronizerStart();
+		expect((yield Note_1.default.all()).length).toBe(10); // but since the fail-safe if on, the notes have not been deleted
+		Setting_1.default.setValue('sync.wipeOutFailSafe', false); // Now switch it off
+		yield synchronizerStart();
+		expect((yield Note_1.default.all()).length).toBe(0); // Since the fail-safe was off, the data has been cleared
+		// Handle case where the sync target has been wiped out, then the user creates one note and sync.
+		for (let i = 0; i < 10; i++) { yield Note_1.default.save({ title: 'note' }); }
+		Setting_1.default.setValue('sync.wipeOutFailSafe', true);
+		yield synchronizerStart();
+		yield fileApi().clearRoot();
+		yield Note_1.default.save({ title: 'ma note encore' });
+		yield synchronizerStart();
+		expect((yield Note_1.default.all()).length).toBe(11);
+	})));
+});
+// # sourceMappingURL=Synchronizer.share.js.map

packages/app-cli/tests/Synchronizer.sharing.ts

@@ -1,39 +1,70 @@
-import { afterAllCleanUp, synchronizerStart, setupDatabaseAndSynchronizer, switchClient } from './test-utils';
-import Note from '@joplin/lib/models/Note';
-import BaseItem from '@joplin/lib/models/BaseItem';
-import shim from '@joplin/lib/shim';
-import Resource from '@joplin/lib/models/Resource';
-
 describe('Synchronizer.sharing', function() {
 
-	beforeEach(async (done) => {
-		await setupDatabaseAndSynchronizer(1);
-		await setupDatabaseAndSynchronizer(2);
-		await switchClient(1);
-		done();
-	});
-
-	afterAll(async () => {
-		await afterAllCleanUp();
-	});
-
-	it('should mark link resources as shared before syncing', (async () => {
-		let note1 = await Note.save({ title: 'note1' });
-		note1 = await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
-		const resourceId1 = (await Note.linkedResourceIds(note1.body))[0];
-
-		const note2 = await Note.save({ title: 'note2' });
-		await shim.attachFileToNote(note2, `${__dirname}/../tests/support/photo.jpg`);
-
-		expect((await Resource.sharedResourceIds()).length).toBe(0);
-
-		await BaseItem.updateShareStatus(note1, true);
-
-		await synchronizerStart();
-
-		const sharedResourceIds = await Resource.sharedResourceIds();
-		expect(sharedResourceIds.length).toBe(1);
-		expect(sharedResourceIds[0]).toBe(resourceId1);
+	it('should skip', (async () => {
+		expect(true).toBe(true);
 	}));
 
 });
+
+// import { afterAllCleanUp, synchronizerStart, setupDatabaseAndSynchronizer, switchClient, joplinServerApi } from './test-utils';
+// import Note from '@joplin/lib/models/Note';
+// import BaseItem from '@joplin/lib/models/BaseItem';
+// import shim from '@joplin/lib/shim';
+// import Resource from '@joplin/lib/models/Resource';
+// import Folder from '@joplin/lib/models/Folder';
+
+// describe('Synchronizer.sharing', function() {
+
+// 	beforeEach(async (done) => {
+// 		await setupDatabaseAndSynchronizer(1);
+// 		await switchClient(1);
+// 		done();
+// 	});
+
+// 	afterAll(async () => {
+// 		await afterAllCleanUp();
+// 	});
+
+// 	it('should mark link resources as shared before syncing', (async () => {
+// 		let note1 = await Note.save({ title: 'note1' });
+// 		note1 = await shim.attachFileToNote(note1, `${__dirname}/../tests/support/photo.jpg`);
+// 		const resourceId1 = (await Note.linkedResourceIds(note1.body))[0];
+
+// 		const note2 = await Note.save({ title: 'note2' });
+// 		await shim.attachFileToNote(note2, `${__dirname}/../tests/support/photo.jpg`);
+
+// 		expect((await Resource.sharedResourceIds()).length).toBe(0);
+
+// 		await BaseItem.updateShareStatus(note1, true);
+
+// 		await synchronizerStart();
+
+// 		const sharedResourceIds = await Resource.sharedResourceIds();
+// 		expect(sharedResourceIds.length).toBe(1);
+// 		expect(sharedResourceIds[0]).toBe(resourceId1);
+// 	}));
+
+// 	it('should share items', (async () => {
+// 		await setupDatabaseAndSynchronizer(1, { userEmail: 'user1@example.com' });
+// 		await switchClient(1);
+
+// 		const api = joplinServerApi();
+// 		await api.exec('POST', 'api/debug', null, { action: 'createTestUsers' });
+// 		await api.clearSession();
+
+// 		const folder1 = await Folder.save({ title: 'folder1' });
+// 		await Note.save({ title: 'note1', parent_id: folder1.id });
+
+// 		await synchronizerStart();
+
+// 		await setupDatabaseAndSynchronizer(2, { userEmail: 'user2@example.com' });
+// 		await switchClient(2);
+
+// 		await synchronizerStart();
+
+// 		await switchClient(1);
+
+// 		console.info(await Note.all());
+// 	}));
+
+// });

packages/app-cli/tests/Synchronizer.tools.ts

@@ -0,0 +1,53 @@
+import { allNotesFolders, remoteNotesAndFolders } from './test-utils-synchronizer';
+import { afterAllCleanUp, synchronizerStart, setupDatabaseAndSynchronizer, switchClient, fileApi, db } from './test-utils';
+import Folder from '@joplin/lib/models/Folder';
+import Note from '@joplin/lib/models/Note';
+import { clearLocalDataForRedownload, clearLocalSyncStateForReupload } from '@joplin/lib/services/synchronizer/tools';
+
+describe('Synchronizer.tools', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await setupDatabaseAndSynchronizer(2);
+		await switchClient(1);
+		done();
+	});
+
+	afterAll(async () => {
+		await afterAllCleanUp();
+	});
+
+	it('should clear local sync data, and re-upload everything to sync target', (async () => {
+		await Folder.save({ title: 'test' });
+
+		await synchronizerStart();
+
+		await fileApi().clearRoot();
+
+		await clearLocalSyncStateForReupload(db());
+
+		// Now that the local sync state has been cleared, it should re-upload
+		// the items as if it was a new sync target. It should also not delete*
+		// any local data.
+		await synchronizerStart();
+		expect((await remoteNotesAndFolders()).length).toBe(1);
+		expect((await Folder.all()).length).toBe(1);
+	}));
+
+	it('should clear local data, and re-downlaod everything from sync target', (async () => {
+		const folder = await Folder.save({ title: 'test' });
+		await Note.save({ title: 'test note', parent_id: folder.id });
+
+		await synchronizerStart();
+
+		await clearLocalDataForRedownload(db());
+
+		expect((await allNotesFolders()).length).toBe(0);
+
+		await synchronizerStart();
+
+		expect((await allNotesFolders()).length).toBe(2);
+		expect((await remoteNotesAndFolders()).length).toBe(2);
+	}));
+
+});

packages/app-cli/tests/dateTimeFormats.ts

@@ -0,0 +1,46 @@
+import Setting from '@joplin/lib/models/Setting';
+import time from '@joplin/lib/time';
+
+describe('dateFormats', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should format date according to DATE_FORMAT', (async () => {
+
+		const now = new Date('2017-01-30T12:00:00').getTime();
+
+		// DATE_FORMAT_1 = 'DD/MM/YYYY';
+		// DATE_FORMAT_2 = 'DD/MM/YY';
+		// DATE_FORMAT_3 = 'MM/DD/YYYY';
+		// DATE_FORMAT_4 = 'MM/DD/YY';
+		// DATE_FORMAT_5 = 'YYYY-MM-DD';
+		// DATE_FORMAT_6 = 'DD.MM.YYYY';
+		// DATE_FORMAT_7 = 'YYYY.MM.DD';
+		// DATE_FORMAT_8 = 'YYMMDD';
+
+		expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_1)).toBe('30/01/2017');
+		expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_2)).toBe('30/01/17');
+		expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_3)).toBe('01/30/2017');
+		expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_4)).toBe('01/30/17');
+		expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_5)).toBe('2017-01-30');
+		expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_6)).toBe('30.01.2017');
+		expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_7)).toBe('2017.01.30');
+		expect(time.formatMsToLocal(now, Setting.DATE_FORMAT_8)).toBe('170130');
+
+	}));
+
+	it('should format time according to TIME_FORMAT', (async () => {
+
+		const now = new Date('2017-01-30T20:30:00').getTime();
+
+		// TIME_FORMAT_1 = 'HH:mm';
+		// TIME_FORMAT_2 = 'h:mm A';
+
+		expect(time.formatMsToLocal(now, Setting.TIME_FORMAT_1)).toBe('20:30');
+		expect(time.formatMsToLocal(now, Setting.TIME_FORMAT_2)).toBe('8:30 PM');
+
+	}));
+
+});

packages/app-cli/tests/file-api-driver.ts

@@ -0,0 +1,69 @@
+import { afterAllCleanUp, setupDatabaseAndSynchronizer, switchClient, fileApi } from './test-utils';
+
+describe('file-api-driver', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1);
+		await switchClient(1);
+		await fileApi().clearRoot();
+		done();
+	});
+
+	afterAll(async () => {
+		await afterAllCleanUp();
+	});
+
+	it('should create a file', (async () => {
+		await fileApi().put('test.txt', 'testing');
+		const content = await fileApi().get('test.txt');
+		expect(content).toBe('testing');
+	}));
+
+	it('should get a file info', (async () => {
+		await fileApi().put('test1.txt', 'testing');
+		await fileApi().mkdir('sub');
+		await fileApi().put('sub/test2.txt', 'testing');
+
+		// Note: Although the stat object includes an "isDir" property, this is
+		// not actually used by the synchronizer so not required by any sync
+		// target.
+
+		{
+			const stat = await fileApi().stat('test1.txt');
+			expect(stat.path).toBe('test1.txt');
+			expect(!!stat.updated_time).toBe(true);
+			expect(stat.isDir).toBe(false);
+		}
+
+		{
+			const stat = await fileApi().stat('sub/test2.txt');
+			expect(stat.path).toBe('sub/test2.txt');
+			expect(!!stat.updated_time).toBe(true);
+			expect(stat.isDir).toBe(false);
+		}
+	}));
+
+	it('should create a file in a subdirectory', (async () => {
+		await fileApi().mkdir('subdir');
+		await fileApi().put('subdir/test.txt', 'testing');
+		const content = await fileApi().get('subdir/test.txt');
+		expect(content).toBe('testing');
+	}));
+
+	it('should list files', (async () => {
+		await fileApi().mkdir('subdir');
+		await fileApi().put('subdir/test1.txt', 'testing1');
+		await fileApi().put('subdir/test2.txt', 'testing2');
+		const files = await fileApi().list('subdir');
+		expect(files.items.length).toBe(2);
+		expect(files.items.map((f: any) => f.path).sort()).toEqual(['test1.txt', 'test2.txt'].sort());
+	}));
+
+	it('should delete a file', (async () => {
+		await fileApi().put('test1.txt', 'testing1');
+		await fileApi().delete('test1.txt');
+		const files = await fileApi().list('');
+		expect(files.items.length).toBe(0);
+	}));
+
+});

packages/app-cli/tests/file_api_driver.js

@@ -1,135 +0,0 @@
-/* eslint-disable no-unused-vars */
-
-
-const uuid = require('@joplin/lib/uuid').default;
-const time = require('@joplin/lib/time').default;
-const { sleep, fileApi, fileContentEqual, checkThrowAsync } = require('./test-utils.js');
-const shim = require('@joplin/lib/shim').default;
-const fs = require('fs-extra');
-const Setting = require('@joplin/lib/models/Setting').default;
-
-const api = null;
-
-// Adding empty test for Jest
-it('will pass', () => {
-	expect(true).toBe(true);
-});
-
-// NOTE: These tests work with S3 and memory driver, but not
-// with other targets like file system or Nextcloud.
-// All this is tested in an indirect way in tests/synchronizer
-// anyway.
-// We keep the file here as it could be useful as a spec for
-// what calls a sync target should support, but it would
-// need to be fixed first.
-
-
-
-// To test out an FileApi implementation:
-// * add a SyncTarget for your driver in `test-utils.js`
-// * set `syncTargetId_` to your New SyncTarget:
-//   `const syncTargetId_ = SyncTargetRegistry.nameToId('memory');`
-// describe('fileApi', function() {
-
-// 	beforeEach(async (done) => {
-// 		api = new fileApi();
-// 		api.clearRoot();
-// 		done();
-// 	});
-
-// 	describe('list', function() {
-// 		it('should return items with relative path', (async () => {
-// 			await api.mkdir('.subfolder');
-// 			await api.put('1', 'something on root 1');
-// 			await api.put('.subfolder/1', 'something subfolder 1');
-// 			await api.put('.subfolder/2', 'something subfolder 2');
-// 			await api.put('.subfolder/3', 'something subfolder 3');
-// 			sleep(0.8);
-
-// 			const response = await api.list('.subfolder');
-// 			const items = response.items;
-// 			expect(items.length).toBe(3);
-// 			expect(items[0].path).toBe('1');
-// 			expect(items[0].updated_time).toMatch(/^\d+$/); // make sure it's using epoch timestamp
-// 		}));
-
-// 		it('should default to only files on root directory', (async () => {
-// 			await api.mkdir('.subfolder');
-// 			await api.put('.subfolder/1', 'something subfolder 1');
-// 			await api.put('file1', 'something 1');
-// 			await api.put('file2', 'something 2');
-// 			sleep(0.6);
-
-// 			const response = await api.list();
-// 			expect(response.items.length).toBe(2);
-// 		}));
-// 	}); // list
-
-// 	describe('delete', function() {
-// 		it('should not error if file does not exist', (async () => {
-// 			const hasThrown = await checkThrowAsync(async () => await api.delete('nonexistant_file'));
-// 			expect(hasThrown).toBe(false);
-// 		}));
-
-// 		it('should delete specific file given full path', (async () => {
-// 			await api.mkdir('deleteDir');
-// 			await api.put('deleteDir/1', 'something 1');
-// 			await api.put('deleteDir/2', 'something 2');
-// 			sleep(0.4);
-
-// 			await api.delete('deleteDir/1');
-// 			let response = await api.list('deleteDir');
-// 			expect(response.items.length).toBe(1);
-// 			response = await api.list('deleteDir/1');
-// 			expect(response.items.length).toBe(0);
-// 		}));
-// 	}); // delete
-
-// 	describe('get', function() {
-// 		it('should return null if object does not exist', (async () => {
-// 			const response = await api.get('nonexistant_file');
-// 			expect(response).toBe(null);
-// 		}));
-
-// 		it('should return UTF-8 encoded string by default', (async () => {
-// 			await api.put('testnote.md', 'something 2');
-
-// 			const response = await api.get('testnote.md');
-// 			expect(response).toBe('something 2');
-// 		}));
-
-// 		it('should return a Response object and writes file to options.path, if options.target is "file"', (async () => {
-// 			const localFilePath = `${Setting.value('tempDir')}/${uuid.create()}.md`;
-// 			await api.put('testnote.md', 'something 2');
-// 			sleep(0.2);
-
-// 			const response = await api.get('testnote.md', { target: 'file', path: localFilePath });
-// 			expect(typeof response).toBe('object');
-// 			// expect(response.path).toBe(localFilePath);
-// 			expect(fs.existsSync(localFilePath)).toBe(true);
-// 			expect(fs.readFileSync(localFilePath, 'utf8')).toBe('something 2');
-// 		}));
-// 	}); // get
-
-// 	describe('put', function() {
-// 		it('should create file to remote path and content', (async () => {
-// 			await api.put('putTest.md', 'I am your content');
-// 			sleep(0.2);
-
-// 			const response = await api.get('putTest.md');
-// 			expect(response).toBe('I am your content');
-// 		}));
-
-// 		it('should upload file in options.path to remote path, if options.source is "file"', (async () => {
-// 			const localFilePath = `${Setting.value('tempDir')}/${uuid.create()}.md`;
-// 			fs.writeFileSync(localFilePath, 'I am the local file.');
-
-// 			await api.put('testfile', 'ignore me', { source: 'file', path: localFilePath });
-// 			sleep(0.2);
-
-// 			const response = await api.get('testfile');
-// 			expect(response).toBe('I am the local file.');
-// 		}));
-// 	}); // put
-
-// });