Server v2.0.3

Merge branch 'dev' into release-2.0
Server: Fixed handling of request origin
2025-08-27 20:29:45 +02:00 · 2021-05-25 20:09:18 +02:00 · 2021-05-25 20:05:29 +02:00 · 2021-05-25 20:04:54 +02:00 · 2021-05-25 19:18:33 +02:00 · 2021-05-25 19:17:42 +02:00
474 changed files with 36382 additions and 20387 deletions
--- a/.eslintignore
+++ b/.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
@@ -73,60 +74,21 @@ packages/app-cli/app/command-settingschema.js.map
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
-packages/app-cli/tests/EnexToMd.d.ts
-packages/app-cli/tests/EnexToMd.js
-packages/app-cli/tests/EnexToMd.js.map
 packages/app-cli/tests/HtmlToMd.d.ts
 packages/app-cli/tests/HtmlToMd.js
 packages/app-cli/tests/HtmlToMd.js.map
-packages/app-cli/tests/InMemoryCache.d.ts
-packages/app-cli/tests/InMemoryCache.js
-packages/app-cli/tests/InMemoryCache.js.map
 packages/app-cli/tests/MdToHtml.d.ts
 packages/app-cli/tests/MdToHtml.js
 packages/app-cli/tests/MdToHtml.js.map
-packages/app-cli/tests/Synchronizer.basics.d.ts
-packages/app-cli/tests/Synchronizer.basics.js
-packages/app-cli/tests/Synchronizer.basics.js.map
-packages/app-cli/tests/Synchronizer.conflicts.d.ts
-packages/app-cli/tests/Synchronizer.conflicts.js
-packages/app-cli/tests/Synchronizer.conflicts.js.map
-packages/app-cli/tests/Synchronizer.e2ee.d.ts
-packages/app-cli/tests/Synchronizer.e2ee.js
-packages/app-cli/tests/Synchronizer.e2ee.js.map
-packages/app-cli/tests/Synchronizer.resources.d.ts
-packages/app-cli/tests/Synchronizer.resources.js
-packages/app-cli/tests/Synchronizer.resources.js.map
-packages/app-cli/tests/Synchronizer.revisions.d.ts
-packages/app-cli/tests/Synchronizer.revisions.js
-packages/app-cli/tests/Synchronizer.revisions.js.map
-packages/app-cli/tests/Synchronizer.sharing.d.ts
-packages/app-cli/tests/Synchronizer.sharing.js
-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/fsDriver.d.ts
-packages/app-cli/tests/fsDriver.js
-packages/app-cli/tests/fsDriver.js.map
-packages/app-cli/tests/htmlUtils.d.ts
-packages/app-cli/tests/htmlUtils.js
-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_Note.d.ts
-packages/app-cli/tests/models_Note.js
-packages/app-cli/tests/models_Note.js.map
-packages/app-cli/tests/models_Setting.d.ts
-packages/app-cli/tests/models_Setting.js
-packages/app-cli/tests/models_Setting.js.map
-packages/app-cli/tests/registry.d.ts
-packages/app-cli/tests/registry.js
-packages/app-cli/tests/registry.js.map
+packages/app-cli/tests/MdToMd.d.ts
+packages/app-cli/tests/MdToMd.js
+packages/app-cli/tests/MdToMd.js.map
+packages/app-cli/tests/services/keychain/KeychainService.d.ts
+packages/app-cli/tests/services/keychain/KeychainService.js
+packages/app-cli/tests/services/keychain/KeychainService.js.map
+packages/app-cli/tests/services/plugins/PluginService.d.ts
+packages/app-cli/tests/services/plugins/PluginService.js
+packages/app-cli/tests/services/plugins/PluginService.js.map
 packages/app-cli/tests/services/plugins/RepositoryApi.d.ts
 packages/app-cli/tests/services/plugins/RepositoryApi.js
 packages/app-cli/tests/services/plugins/RepositoryApi.js.map
@@ -142,39 +104,9 @@ packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js.map
 packages/app-cli/tests/services/plugins/sandboxProxy.d.ts
 packages/app-cli/tests/services/plugins/sandboxProxy.js
 packages/app-cli/tests/services/plugins/sandboxProxy.js.map
-packages/app-cli/tests/services_CommandService.d.ts
-packages/app-cli/tests/services_CommandService.js
-packages/app-cli/tests/services_CommandService.js.map
-packages/app-cli/tests/services_InteropService.d.ts
-packages/app-cli/tests/services_InteropService.js
-packages/app-cli/tests/services_InteropService.js.map
-packages/app-cli/tests/services_InteropService_Exporter_Html.d.ts
-packages/app-cli/tests/services_InteropService_Exporter_Html.js
-packages/app-cli/tests/services_InteropService_Exporter_Html.js.map
-packages/app-cli/tests/services_PluginService.d.ts
-packages/app-cli/tests/services_PluginService.js
-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_keychainService.d.ts
-packages/app-cli/tests/services_keychainService.js
-packages/app-cli/tests/services_keychainService.js.map
-packages/app-cli/tests/services_rest_Api.d.ts
-packages/app-cli/tests/services_rest_Api.js
-packages/app-cli/tests/services_rest_Api.js.map
-packages/app-cli/tests/synchronizer_LockHandler.d.ts
-packages/app-cli/tests/synchronizer_LockHandler.js
-packages/app-cli/tests/synchronizer_LockHandler.js.map
-packages/app-cli/tests/synchronizer_MigrationHandler.d.ts
-packages/app-cli/tests/synchronizer_MigrationHandler.js
-packages/app-cli/tests/synchronizer_MigrationHandler.js.map
-packages/app-cli/tests/test-utils-synchronizer.d.ts
-packages/app-cli/tests/test-utils-synchronizer.js
-packages/app-cli/tests/test-utils-synchronizer.js.map
-packages/app-cli/tests/test-utils.d.ts
-packages/app-cli/tests/test-utils.js
-packages/app-cli/tests/test-utils.js.map
+packages/app-cli/tests/testUtils.d.ts
+packages/app-cli/tests/testUtils.js
+packages/app-cli/tests/testUtils.js.map
 packages/app-desktop/ElectronAppWrapper.d.ts
 packages/app-desktop/ElectronAppWrapper.js
 packages/app-desktop/ElectronAppWrapper.js.map
@@ -187,6 +119,9 @@ packages/app-desktop/app.js.map
 packages/app-desktop/bridge.d.ts
 packages/app-desktop/bridge.js
 packages/app-desktop/bridge.js.map
+packages/app-desktop/checkForUpdates.d.ts
+packages/app-desktop/checkForUpdates.js
+packages/app-desktop/checkForUpdates.js.map
 packages/app-desktop/commands/copyDevCommand.d.ts
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyDevCommand.js.map
@@ -244,6 +179,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
@@ -331,6 +275,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
@@ -550,6 +497,9 @@ packages/app-desktop/gui/ResizableLayout/utils/persist.test.js.map
 packages/app-desktop/gui/ResizableLayout/utils/removeItem.d.ts
 packages/app-desktop/gui/ResizableLayout/utils/removeItem.js
 packages/app-desktop/gui/ResizableLayout/utils/removeItem.js.map
+packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.d.ts
+packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.js
+packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.js.map
 packages/app-desktop/gui/ResizableLayout/utils/setLayoutItemProps.d.ts
 packages/app-desktop/gui/ResizableLayout/utils/setLayoutItemProps.js
 packages/app-desktop/gui/ResizableLayout/utils/setLayoutItemProps.js.map
@@ -583,6 +533,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
@@ -640,9 +593,18 @@ 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/StyledLink.d.ts
+packages/app-desktop/gui/style/StyledLink.js
+packages/app-desktop/gui/style/StyledLink.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
@@ -745,9 +707,9 @@ packages/app-mobile/services/AlarmServiceDriver.android.js.map
 packages/app-mobile/services/AlarmServiceDriver.ios.d.ts
 packages/app-mobile/services/AlarmServiceDriver.ios.js
 packages/app-mobile/services/AlarmServiceDriver.ios.js.map
-packages/app-mobile/setUpQuickActions.d.ts
-packages/app-mobile/setUpQuickActions.js
-packages/app-mobile/setUpQuickActions.js.map
+packages/app-mobile/setupQuickActions.d.ts
+packages/app-mobile/setupQuickActions.js
+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
@@ -763,6 +725,9 @@ packages/app-mobile/utils/checkPermissions.js.map
 packages/app-mobile/utils/fs-driver-rn.d.ts
 packages/app-mobile/utils/fs-driver-rn.js
 packages/app-mobile/utils/fs-driver-rn.js.map
+packages/app-mobile/utils/setupNotifications.d.ts
+packages/app-mobile/utils/setupNotifications.js
+packages/app-mobile/utils/setupNotifications.js.map
 packages/app-mobile/utils/shareHandler.d.ts
 packages/app-mobile/utils/shareHandler.js
 packages/app-mobile/utils/shareHandler.js.map
@@ -838,9 +803,15 @@ packages/lib/HtmlToMd.js.map
 packages/lib/InMemoryCache.d.ts
 packages/lib/InMemoryCache.js
 packages/lib/InMemoryCache.js.map
+packages/lib/InMemoryCache.test.d.ts
+packages/lib/InMemoryCache.test.js
+packages/lib/InMemoryCache.test.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
@@ -871,6 +842,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
@@ -883,6 +857,9 @@ packages/lib/eventManager.js.map
 packages/lib/file-api-driver-joplinServer.d.ts
 packages/lib/file-api-driver-joplinServer.js
 packages/lib/file-api-driver-joplinServer.js.map
+packages/lib/file-api-driver.test.d.ts
+packages/lib/file-api-driver.test.js
+packages/lib/file-api-driver.test.js.map
 packages/lib/file-api.d.ts
 packages/lib/file-api.js
 packages/lib/file-api.js.map
@@ -892,12 +869,24 @@ packages/lib/fs-driver-base.js.map
 packages/lib/fs-driver-node.d.ts
 packages/lib/fs-driver-node.js
 packages/lib/fs-driver-node.js.map
+packages/lib/fsDriver.test.d.ts
+packages/lib/fsDriver.test.js
+packages/lib/fsDriver.test.js.map
 packages/lib/htmlUtils.d.ts
 packages/lib/htmlUtils.js
 packages/lib/htmlUtils.js.map
+packages/lib/htmlUtils.test.d.ts
+packages/lib/htmlUtils.test.js
+packages/lib/htmlUtils.test.js.map
+packages/lib/htmlUtils2.test.d.ts
+packages/lib/htmlUtils2.test.js
+packages/lib/htmlUtils2.test.js.map
 packages/lib/import-enex-md-gen.d.ts
 packages/lib/import-enex-md-gen.js
 packages/lib/import-enex-md-gen.js.map
+packages/lib/import-enex-md-gen.test.d.ts
+packages/lib/import-enex-md-gen.test.js
+packages/lib/import-enex-md-gen.test.js.map
 packages/lib/locale.d.ts
 packages/lib/locale.js
 packages/lib/locale.js.map
@@ -907,6 +896,9 @@ packages/lib/markdownUtils.js.map
 packages/lib/markdownUtils.test.d.ts
 packages/lib/markdownUtils.test.js
 packages/lib/markdownUtils.test.js.map
+packages/lib/markdownUtils2.test.d.ts
+packages/lib/markdownUtils2.test.js
+packages/lib/markdownUtils2.test.js.map
 packages/lib/markupLanguageUtils.d.ts
 packages/lib/markupLanguageUtils.js
 packages/lib/markupLanguageUtils.js.map
@@ -919,6 +911,12 @@ packages/lib/models/BaseItem.js.map
 packages/lib/models/Folder.d.ts
 packages/lib/models/Folder.js
 packages/lib/models/Folder.js.map
+packages/lib/models/Folder.sharing.test.d.ts
+packages/lib/models/Folder.sharing.test.js
+packages/lib/models/Folder.sharing.test.js.map
+packages/lib/models/Folder.test.d.ts
+packages/lib/models/Folder.test.js
+packages/lib/models/Folder.test.js.map
 packages/lib/models/ItemChange.d.ts
 packages/lib/models/ItemChange.js
 packages/lib/models/ItemChange.js.map
@@ -931,6 +929,9 @@ packages/lib/models/Migration.js.map
 packages/lib/models/Note.d.ts
 packages/lib/models/Note.js
 packages/lib/models/Note.js.map
+packages/lib/models/Note.test.d.ts
+packages/lib/models/Note.test.js
+packages/lib/models/Note.test.js.map
 packages/lib/models/NoteResource.d.ts
 packages/lib/models/NoteResource.js
 packages/lib/models/NoteResource.js.map
@@ -952,12 +953,18 @@ packages/lib/models/Search.js.map
 packages/lib/models/Setting.d.ts
 packages/lib/models/Setting.js
 packages/lib/models/Setting.js.map
+packages/lib/models/Setting.test.d.ts
+packages/lib/models/Setting.test.js
+packages/lib/models/Setting.test.js.map
 packages/lib/models/SmartFilter.d.ts
 packages/lib/models/SmartFilter.js
 packages/lib/models/SmartFilter.js.map
 packages/lib/models/Tag.d.ts
 packages/lib/models/Tag.js
 packages/lib/models/Tag.js.map
+packages/lib/models/dateTimeFormats.test.d.ts
+packages/lib/models/dateTimeFormats.test.js
+packages/lib/models/dateTimeFormats.test.js.map
 packages/lib/models/settings/FileHandler.d.ts
 packages/lib/models/settings/FileHandler.js
 packages/lib/models/settings/FileHandler.js.map
@@ -985,6 +992,9 @@ packages/lib/reducer.js.map
 packages/lib/registry.d.ts
 packages/lib/registry.js
 packages/lib/registry.js.map
+packages/lib/registry.test.d.ts
+packages/lib/registry.test.js
+packages/lib/registry.test.js.map
 packages/lib/services/AlarmService.d.ts
 packages/lib/services/AlarmService.js
 packages/lib/services/AlarmService.js.map
@@ -997,6 +1007,9 @@ packages/lib/services/BaseService.js.map
 packages/lib/services/CommandService.d.ts
 packages/lib/services/CommandService.js
 packages/lib/services/CommandService.js.map
+packages/lib/services/CommandService.test.d.ts
+packages/lib/services/CommandService.test.js
+packages/lib/services/CommandService.test.js.map
 packages/lib/services/DecryptionWorker.d.ts
 packages/lib/services/DecryptionWorker.js
 packages/lib/services/DecryptionWorker.js.map
@@ -1045,6 +1058,9 @@ packages/lib/services/ResourceFetcher.js.map
 packages/lib/services/ResourceService.d.ts
 packages/lib/services/ResourceService.js
 packages/lib/services/ResourceService.js.map
+packages/lib/services/ResourceService.test.d.ts
+packages/lib/services/ResourceService.test.js
+packages/lib/services/ResourceService.test.js.map
 packages/lib/services/RevisionService.d.ts
 packages/lib/services/RevisionService.js
 packages/lib/services/RevisionService.js.map
@@ -1057,6 +1073,9 @@ packages/lib/services/UndoRedoService.js.map
 packages/lib/services/WhenClause.d.ts
 packages/lib/services/WhenClause.js
 packages/lib/services/WhenClause.js.map
+packages/lib/services/WhenClause.test.d.ts
+packages/lib/services/WhenClause.test.js
+packages/lib/services/WhenClause.test.js.map
 packages/lib/services/commands/MenuUtils.d.ts
 packages/lib/services/commands/MenuUtils.js
 packages/lib/services/commands/MenuUtils.js.map
@@ -1090,6 +1109,9 @@ packages/lib/services/debug/populateDatabase.js.map
 packages/lib/services/interop/InteropService.d.ts
 packages/lib/services/interop/InteropService.js
 packages/lib/services/interop/InteropService.js.map
+packages/lib/services/interop/InteropService.test.d.ts
+packages/lib/services/interop/InteropService.test.js
+packages/lib/services/interop/InteropService.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Base.d.ts
 packages/lib/services/interop/InteropService_Exporter_Base.js
 packages/lib/services/interop/InteropService_Exporter_Base.js.map
@@ -1099,6 +1121,9 @@ packages/lib/services/interop/InteropService_Exporter_Custom.js.map
 packages/lib/services/interop/InteropService_Exporter_Html.d.ts
 packages/lib/services/interop/InteropService_Exporter_Html.js
 packages/lib/services/interop/InteropService_Exporter_Html.js.map
+packages/lib/services/interop/InteropService_Exporter_Html.test.d.ts
+packages/lib/services/interop/InteropService_Exporter_Html.test.js
+packages/lib/services/interop/InteropService_Exporter_Html.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Jex.d.ts
 packages/lib/services/interop/InteropService_Exporter_Jex.js
 packages/lib/services/interop/InteropService_Exporter_Jex.js.map
@@ -1261,6 +1286,9 @@ packages/lib/services/plugins/utils/validatePluginId.test.js.map
 packages/lib/services/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
+packages/lib/services/rest/Api.test.d.ts
+packages/lib/services/rest/Api.test.js
+packages/lib/services/rest/Api.test.js.map
 packages/lib/services/rest/ApiResponse.d.ts
 packages/lib/services/rest/ApiResponse.js
 packages/lib/services/rest/ApiResponse.js.map
@@ -1321,12 +1349,21 @@ packages/lib/services/searchengine/SearchEngine.js.map
 packages/lib/services/searchengine/SearchEngineUtils.d.ts
 packages/lib/services/searchengine/SearchEngineUtils.js
 packages/lib/services/searchengine/SearchEngineUtils.js.map
+packages/lib/services/searchengine/SearchEngineUtils.test.d.ts
+packages/lib/services/searchengine/SearchEngineUtils.test.js
+packages/lib/services/searchengine/SearchEngineUtils.test.js.map
 packages/lib/services/searchengine/filterParser.d.ts
 packages/lib/services/searchengine/filterParser.js
 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
@@ -1339,6 +1376,30 @@ packages/lib/services/synchronizer/LockHandler.js.map
 packages/lib/services/synchronizer/MigrationHandler.d.ts
 packages/lib/services/synchronizer/MigrationHandler.js
 packages/lib/services/synchronizer/MigrationHandler.js.map
+packages/lib/services/synchronizer/Synchronizer.basics.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.basics.test.js
+packages/lib/services/synchronizer/Synchronizer.basics.test.js.map
+packages/lib/services/synchronizer/Synchronizer.conflicts.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.conflicts.test.js
+packages/lib/services/synchronizer/Synchronizer.conflicts.test.js.map
+packages/lib/services/synchronizer/Synchronizer.e2ee.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.e2ee.test.js
+packages/lib/services/synchronizer/Synchronizer.e2ee.test.js.map
+packages/lib/services/synchronizer/Synchronizer.resources.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.resources.test.js
+packages/lib/services/synchronizer/Synchronizer.resources.test.js.map
+packages/lib/services/synchronizer/Synchronizer.revisions.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.revisions.test.js
+packages/lib/services/synchronizer/Synchronizer.revisions.test.js.map
+packages/lib/services/synchronizer/Synchronizer.sharing.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.sharing.test.js
+packages/lib/services/synchronizer/Synchronizer.sharing.test.js.map
+packages/lib/services/synchronizer/Synchronizer.tags.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.tags.test.js
+packages/lib/services/synchronizer/Synchronizer.tags.test.js.map
+packages/lib/services/synchronizer/Synchronizer.tools.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.tools.test.js
+packages/lib/services/synchronizer/Synchronizer.tools.test.js.map
 packages/lib/services/synchronizer/gui/useSyncTargetUpgrade.d.ts
 packages/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
 packages/lib/services/synchronizer/gui/useSyncTargetUpgrade.js.map
@@ -1348,6 +1409,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/synchronizer_LockHandler.test.d.ts
+packages/lib/services/synchronizer/synchronizer_LockHandler.test.js
+packages/lib/services/synchronizer/synchronizer_LockHandler.test.js.map
+packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.d.ts
+packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js
+packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js.map
 packages/lib/services/synchronizer/tools.d.ts
 packages/lib/services/synchronizer/tools.js
 packages/lib/services/synchronizer/tools.js.map
@@ -1360,6 +1427,12 @@ packages/lib/services/synchronizer/utils/types.js.map
 packages/lib/shim.d.ts
 packages/lib/shim.js
 packages/lib/shim.js.map
+packages/lib/testing/test-utils-synchronizer.d.ts
+packages/lib/testing/test-utils-synchronizer.js
+packages/lib/testing/test-utils-synchronizer.js.map
+packages/lib/testing/test-utils.d.ts
+packages/lib/testing/test-utils.js
+packages/lib/testing/test-utils.js.map
 packages/lib/theme.d.ts
 packages/lib/theme.js
 packages/lib/theme.js.map
@@ -1393,6 +1466,9 @@ packages/lib/themes/type.js.map
 packages/lib/time.d.ts
 packages/lib/time.js
 packages/lib/time.js.map
+packages/lib/utils/credentialFiles.d.ts
+packages/lib/utils/credentialFiles.js
+packages/lib/utils/credentialFiles.js.map
 packages/lib/uuid.d.ts
 packages/lib/uuid.js
 packages/lib/uuid.js.map
@@ -1519,6 +1595,9 @@ packages/tools/generate-database-types.js.map
 packages/tools/lerna-add.d.ts
 packages/tools/lerna-add.js
 packages/tools/lerna-add.js.map
+packages/tools/release-android.d.ts
+packages/tools/release-android.js
+packages/tools/release-android.js.map
 packages/tools/release-cli.d.ts
 packages/tools/release-cli.js
 packages/tools/release-cli.js.map
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -76,7 +76,7 @@ module.exports = {

 		// Warn only for now because fixing everything would take too much
 		// refactoring, but new code should try to stick to it.
-		'complexity': ['warn', { max: 10 }],
+		// 'complexity': ['warn', { max: 10 }],

 		// Checks rules of Hooks
 		'react-hooks/rules-of-hooks': 'error',
--- a/.gitignore
+++ b/.gitignore
@@ -60,60 +60,21 @@ packages/app-cli/app/command-settingschema.js.map
 packages/app-cli/app/services/plugins/PluginRunner.d.ts
 packages/app-cli/app/services/plugins/PluginRunner.js
 packages/app-cli/app/services/plugins/PluginRunner.js.map
-packages/app-cli/tests/EnexToMd.d.ts
-packages/app-cli/tests/EnexToMd.js
-packages/app-cli/tests/EnexToMd.js.map
 packages/app-cli/tests/HtmlToMd.d.ts
 packages/app-cli/tests/HtmlToMd.js
 packages/app-cli/tests/HtmlToMd.js.map
-packages/app-cli/tests/InMemoryCache.d.ts
-packages/app-cli/tests/InMemoryCache.js
-packages/app-cli/tests/InMemoryCache.js.map
 packages/app-cli/tests/MdToHtml.d.ts
 packages/app-cli/tests/MdToHtml.js
 packages/app-cli/tests/MdToHtml.js.map
-packages/app-cli/tests/Synchronizer.basics.d.ts
-packages/app-cli/tests/Synchronizer.basics.js
-packages/app-cli/tests/Synchronizer.basics.js.map
-packages/app-cli/tests/Synchronizer.conflicts.d.ts
-packages/app-cli/tests/Synchronizer.conflicts.js
-packages/app-cli/tests/Synchronizer.conflicts.js.map
-packages/app-cli/tests/Synchronizer.e2ee.d.ts
-packages/app-cli/tests/Synchronizer.e2ee.js
-packages/app-cli/tests/Synchronizer.e2ee.js.map
-packages/app-cli/tests/Synchronizer.resources.d.ts
-packages/app-cli/tests/Synchronizer.resources.js
-packages/app-cli/tests/Synchronizer.resources.js.map
-packages/app-cli/tests/Synchronizer.revisions.d.ts
-packages/app-cli/tests/Synchronizer.revisions.js
-packages/app-cli/tests/Synchronizer.revisions.js.map
-packages/app-cli/tests/Synchronizer.sharing.d.ts
-packages/app-cli/tests/Synchronizer.sharing.js
-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/fsDriver.d.ts
-packages/app-cli/tests/fsDriver.js
-packages/app-cli/tests/fsDriver.js.map
-packages/app-cli/tests/htmlUtils.d.ts
-packages/app-cli/tests/htmlUtils.js
-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_Note.d.ts
-packages/app-cli/tests/models_Note.js
-packages/app-cli/tests/models_Note.js.map
-packages/app-cli/tests/models_Setting.d.ts
-packages/app-cli/tests/models_Setting.js
-packages/app-cli/tests/models_Setting.js.map
-packages/app-cli/tests/registry.d.ts
-packages/app-cli/tests/registry.js
-packages/app-cli/tests/registry.js.map
+packages/app-cli/tests/MdToMd.d.ts
+packages/app-cli/tests/MdToMd.js
+packages/app-cli/tests/MdToMd.js.map
+packages/app-cli/tests/services/keychain/KeychainService.d.ts
+packages/app-cli/tests/services/keychain/KeychainService.js
+packages/app-cli/tests/services/keychain/KeychainService.js.map
+packages/app-cli/tests/services/plugins/PluginService.d.ts
+packages/app-cli/tests/services/plugins/PluginService.js
+packages/app-cli/tests/services/plugins/PluginService.js.map
 packages/app-cli/tests/services/plugins/RepositoryApi.d.ts
 packages/app-cli/tests/services/plugins/RepositoryApi.js
 packages/app-cli/tests/services/plugins/RepositoryApi.js.map
@@ -129,39 +90,9 @@ packages/app-cli/tests/services/plugins/api/JoplinWorkspace.js.map
 packages/app-cli/tests/services/plugins/sandboxProxy.d.ts
 packages/app-cli/tests/services/plugins/sandboxProxy.js
 packages/app-cli/tests/services/plugins/sandboxProxy.js.map
-packages/app-cli/tests/services_CommandService.d.ts
-packages/app-cli/tests/services_CommandService.js
-packages/app-cli/tests/services_CommandService.js.map
-packages/app-cli/tests/services_InteropService.d.ts
-packages/app-cli/tests/services_InteropService.js
-packages/app-cli/tests/services_InteropService.js.map
-packages/app-cli/tests/services_InteropService_Exporter_Html.d.ts
-packages/app-cli/tests/services_InteropService_Exporter_Html.js
-packages/app-cli/tests/services_InteropService_Exporter_Html.js.map
-packages/app-cli/tests/services_PluginService.d.ts
-packages/app-cli/tests/services_PluginService.js
-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_keychainService.d.ts
-packages/app-cli/tests/services_keychainService.js
-packages/app-cli/tests/services_keychainService.js.map
-packages/app-cli/tests/services_rest_Api.d.ts
-packages/app-cli/tests/services_rest_Api.js
-packages/app-cli/tests/services_rest_Api.js.map
-packages/app-cli/tests/synchronizer_LockHandler.d.ts
-packages/app-cli/tests/synchronizer_LockHandler.js
-packages/app-cli/tests/synchronizer_LockHandler.js.map
-packages/app-cli/tests/synchronizer_MigrationHandler.d.ts
-packages/app-cli/tests/synchronizer_MigrationHandler.js
-packages/app-cli/tests/synchronizer_MigrationHandler.js.map
-packages/app-cli/tests/test-utils-synchronizer.d.ts
-packages/app-cli/tests/test-utils-synchronizer.js
-packages/app-cli/tests/test-utils-synchronizer.js.map
-packages/app-cli/tests/test-utils.d.ts
-packages/app-cli/tests/test-utils.js
-packages/app-cli/tests/test-utils.js.map
+packages/app-cli/tests/testUtils.d.ts
+packages/app-cli/tests/testUtils.js
+packages/app-cli/tests/testUtils.js.map
 packages/app-desktop/ElectronAppWrapper.d.ts
 packages/app-desktop/ElectronAppWrapper.js
 packages/app-desktop/ElectronAppWrapper.js.map
@@ -174,6 +105,9 @@ packages/app-desktop/app.js.map
 packages/app-desktop/bridge.d.ts
 packages/app-desktop/bridge.js
 packages/app-desktop/bridge.js.map
+packages/app-desktop/checkForUpdates.d.ts
+packages/app-desktop/checkForUpdates.js
+packages/app-desktop/checkForUpdates.js.map
 packages/app-desktop/commands/copyDevCommand.d.ts
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyDevCommand.js.map
@@ -231,6 +165,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
@@ -318,6 +261,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
@@ -537,6 +483,9 @@ packages/app-desktop/gui/ResizableLayout/utils/persist.test.js.map
 packages/app-desktop/gui/ResizableLayout/utils/removeItem.d.ts
 packages/app-desktop/gui/ResizableLayout/utils/removeItem.js
 packages/app-desktop/gui/ResizableLayout/utils/removeItem.js.map
+packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.d.ts
+packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.js
+packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.js.map
 packages/app-desktop/gui/ResizableLayout/utils/setLayoutItemProps.d.ts
 packages/app-desktop/gui/ResizableLayout/utils/setLayoutItemProps.js
 packages/app-desktop/gui/ResizableLayout/utils/setLayoutItemProps.js.map
@@ -570,6 +519,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
@@ -627,9 +579,18 @@ 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/StyledLink.d.ts
+packages/app-desktop/gui/style/StyledLink.js
+packages/app-desktop/gui/style/StyledLink.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
@@ -732,9 +693,9 @@ packages/app-mobile/services/AlarmServiceDriver.android.js.map
 packages/app-mobile/services/AlarmServiceDriver.ios.d.ts
 packages/app-mobile/services/AlarmServiceDriver.ios.js
 packages/app-mobile/services/AlarmServiceDriver.ios.js.map
-packages/app-mobile/setUpQuickActions.d.ts
-packages/app-mobile/setUpQuickActions.js
-packages/app-mobile/setUpQuickActions.js.map
+packages/app-mobile/setupQuickActions.d.ts
+packages/app-mobile/setupQuickActions.js
+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
@@ -750,6 +711,9 @@ packages/app-mobile/utils/checkPermissions.js.map
 packages/app-mobile/utils/fs-driver-rn.d.ts
 packages/app-mobile/utils/fs-driver-rn.js
 packages/app-mobile/utils/fs-driver-rn.js.map
+packages/app-mobile/utils/setupNotifications.d.ts
+packages/app-mobile/utils/setupNotifications.js
+packages/app-mobile/utils/setupNotifications.js.map
 packages/app-mobile/utils/shareHandler.d.ts
 packages/app-mobile/utils/shareHandler.js
 packages/app-mobile/utils/shareHandler.js.map
@@ -825,9 +789,15 @@ packages/lib/HtmlToMd.js.map
 packages/lib/InMemoryCache.d.ts
 packages/lib/InMemoryCache.js
 packages/lib/InMemoryCache.js.map
+packages/lib/InMemoryCache.test.d.ts
+packages/lib/InMemoryCache.test.js
+packages/lib/InMemoryCache.test.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
@@ -858,6 +828,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
@@ -870,6 +843,9 @@ packages/lib/eventManager.js.map
 packages/lib/file-api-driver-joplinServer.d.ts
 packages/lib/file-api-driver-joplinServer.js
 packages/lib/file-api-driver-joplinServer.js.map
+packages/lib/file-api-driver.test.d.ts
+packages/lib/file-api-driver.test.js
+packages/lib/file-api-driver.test.js.map
 packages/lib/file-api.d.ts
 packages/lib/file-api.js
 packages/lib/file-api.js.map
@@ -879,12 +855,24 @@ packages/lib/fs-driver-base.js.map
 packages/lib/fs-driver-node.d.ts
 packages/lib/fs-driver-node.js
 packages/lib/fs-driver-node.js.map
+packages/lib/fsDriver.test.d.ts
+packages/lib/fsDriver.test.js
+packages/lib/fsDriver.test.js.map
 packages/lib/htmlUtils.d.ts
 packages/lib/htmlUtils.js
 packages/lib/htmlUtils.js.map
+packages/lib/htmlUtils.test.d.ts
+packages/lib/htmlUtils.test.js
+packages/lib/htmlUtils.test.js.map
+packages/lib/htmlUtils2.test.d.ts
+packages/lib/htmlUtils2.test.js
+packages/lib/htmlUtils2.test.js.map
 packages/lib/import-enex-md-gen.d.ts
 packages/lib/import-enex-md-gen.js
 packages/lib/import-enex-md-gen.js.map
+packages/lib/import-enex-md-gen.test.d.ts
+packages/lib/import-enex-md-gen.test.js
+packages/lib/import-enex-md-gen.test.js.map
 packages/lib/locale.d.ts
 packages/lib/locale.js
 packages/lib/locale.js.map
@@ -894,6 +882,9 @@ packages/lib/markdownUtils.js.map
 packages/lib/markdownUtils.test.d.ts
 packages/lib/markdownUtils.test.js
 packages/lib/markdownUtils.test.js.map
+packages/lib/markdownUtils2.test.d.ts
+packages/lib/markdownUtils2.test.js
+packages/lib/markdownUtils2.test.js.map
 packages/lib/markupLanguageUtils.d.ts
 packages/lib/markupLanguageUtils.js
 packages/lib/markupLanguageUtils.js.map
@@ -906,6 +897,12 @@ packages/lib/models/BaseItem.js.map
 packages/lib/models/Folder.d.ts
 packages/lib/models/Folder.js
 packages/lib/models/Folder.js.map
+packages/lib/models/Folder.sharing.test.d.ts
+packages/lib/models/Folder.sharing.test.js
+packages/lib/models/Folder.sharing.test.js.map
+packages/lib/models/Folder.test.d.ts
+packages/lib/models/Folder.test.js
+packages/lib/models/Folder.test.js.map
 packages/lib/models/ItemChange.d.ts
 packages/lib/models/ItemChange.js
 packages/lib/models/ItemChange.js.map
@@ -918,6 +915,9 @@ packages/lib/models/Migration.js.map
 packages/lib/models/Note.d.ts
 packages/lib/models/Note.js
 packages/lib/models/Note.js.map
+packages/lib/models/Note.test.d.ts
+packages/lib/models/Note.test.js
+packages/lib/models/Note.test.js.map
 packages/lib/models/NoteResource.d.ts
 packages/lib/models/NoteResource.js
 packages/lib/models/NoteResource.js.map
@@ -939,12 +939,18 @@ packages/lib/models/Search.js.map
 packages/lib/models/Setting.d.ts
 packages/lib/models/Setting.js
 packages/lib/models/Setting.js.map
+packages/lib/models/Setting.test.d.ts
+packages/lib/models/Setting.test.js
+packages/lib/models/Setting.test.js.map
 packages/lib/models/SmartFilter.d.ts
 packages/lib/models/SmartFilter.js
 packages/lib/models/SmartFilter.js.map
 packages/lib/models/Tag.d.ts
 packages/lib/models/Tag.js
 packages/lib/models/Tag.js.map
+packages/lib/models/dateTimeFormats.test.d.ts
+packages/lib/models/dateTimeFormats.test.js
+packages/lib/models/dateTimeFormats.test.js.map
 packages/lib/models/settings/FileHandler.d.ts
 packages/lib/models/settings/FileHandler.js
 packages/lib/models/settings/FileHandler.js.map
@@ -972,6 +978,9 @@ packages/lib/reducer.js.map
 packages/lib/registry.d.ts
 packages/lib/registry.js
 packages/lib/registry.js.map
+packages/lib/registry.test.d.ts
+packages/lib/registry.test.js
+packages/lib/registry.test.js.map
 packages/lib/services/AlarmService.d.ts
 packages/lib/services/AlarmService.js
 packages/lib/services/AlarmService.js.map
@@ -984,6 +993,9 @@ packages/lib/services/BaseService.js.map
 packages/lib/services/CommandService.d.ts
 packages/lib/services/CommandService.js
 packages/lib/services/CommandService.js.map
+packages/lib/services/CommandService.test.d.ts
+packages/lib/services/CommandService.test.js
+packages/lib/services/CommandService.test.js.map
 packages/lib/services/DecryptionWorker.d.ts
 packages/lib/services/DecryptionWorker.js
 packages/lib/services/DecryptionWorker.js.map
@@ -1032,6 +1044,9 @@ packages/lib/services/ResourceFetcher.js.map
 packages/lib/services/ResourceService.d.ts
 packages/lib/services/ResourceService.js
 packages/lib/services/ResourceService.js.map
+packages/lib/services/ResourceService.test.d.ts
+packages/lib/services/ResourceService.test.js
+packages/lib/services/ResourceService.test.js.map
 packages/lib/services/RevisionService.d.ts
 packages/lib/services/RevisionService.js
 packages/lib/services/RevisionService.js.map
@@ -1044,6 +1059,9 @@ packages/lib/services/UndoRedoService.js.map
 packages/lib/services/WhenClause.d.ts
 packages/lib/services/WhenClause.js
 packages/lib/services/WhenClause.js.map
+packages/lib/services/WhenClause.test.d.ts
+packages/lib/services/WhenClause.test.js
+packages/lib/services/WhenClause.test.js.map
 packages/lib/services/commands/MenuUtils.d.ts
 packages/lib/services/commands/MenuUtils.js
 packages/lib/services/commands/MenuUtils.js.map
@@ -1077,6 +1095,9 @@ packages/lib/services/debug/populateDatabase.js.map
 packages/lib/services/interop/InteropService.d.ts
 packages/lib/services/interop/InteropService.js
 packages/lib/services/interop/InteropService.js.map
+packages/lib/services/interop/InteropService.test.d.ts
+packages/lib/services/interop/InteropService.test.js
+packages/lib/services/interop/InteropService.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Base.d.ts
 packages/lib/services/interop/InteropService_Exporter_Base.js
 packages/lib/services/interop/InteropService_Exporter_Base.js.map
@@ -1086,6 +1107,9 @@ packages/lib/services/interop/InteropService_Exporter_Custom.js.map
 packages/lib/services/interop/InteropService_Exporter_Html.d.ts
 packages/lib/services/interop/InteropService_Exporter_Html.js
 packages/lib/services/interop/InteropService_Exporter_Html.js.map
+packages/lib/services/interop/InteropService_Exporter_Html.test.d.ts
+packages/lib/services/interop/InteropService_Exporter_Html.test.js
+packages/lib/services/interop/InteropService_Exporter_Html.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Jex.d.ts
 packages/lib/services/interop/InteropService_Exporter_Jex.js
 packages/lib/services/interop/InteropService_Exporter_Jex.js.map
@@ -1248,6 +1272,9 @@ packages/lib/services/plugins/utils/validatePluginId.test.js.map
 packages/lib/services/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
+packages/lib/services/rest/Api.test.d.ts
+packages/lib/services/rest/Api.test.js
+packages/lib/services/rest/Api.test.js.map
 packages/lib/services/rest/ApiResponse.d.ts
 packages/lib/services/rest/ApiResponse.js
 packages/lib/services/rest/ApiResponse.js.map
@@ -1308,12 +1335,21 @@ packages/lib/services/searchengine/SearchEngine.js.map
 packages/lib/services/searchengine/SearchEngineUtils.d.ts
 packages/lib/services/searchengine/SearchEngineUtils.js
 packages/lib/services/searchengine/SearchEngineUtils.js.map
+packages/lib/services/searchengine/SearchEngineUtils.test.d.ts
+packages/lib/services/searchengine/SearchEngineUtils.test.js
+packages/lib/services/searchengine/SearchEngineUtils.test.js.map
 packages/lib/services/searchengine/filterParser.d.ts
 packages/lib/services/searchengine/filterParser.js
 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
@@ -1326,6 +1362,30 @@ packages/lib/services/synchronizer/LockHandler.js.map
 packages/lib/services/synchronizer/MigrationHandler.d.ts
 packages/lib/services/synchronizer/MigrationHandler.js
 packages/lib/services/synchronizer/MigrationHandler.js.map
+packages/lib/services/synchronizer/Synchronizer.basics.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.basics.test.js
+packages/lib/services/synchronizer/Synchronizer.basics.test.js.map
+packages/lib/services/synchronizer/Synchronizer.conflicts.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.conflicts.test.js
+packages/lib/services/synchronizer/Synchronizer.conflicts.test.js.map
+packages/lib/services/synchronizer/Synchronizer.e2ee.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.e2ee.test.js
+packages/lib/services/synchronizer/Synchronizer.e2ee.test.js.map
+packages/lib/services/synchronizer/Synchronizer.resources.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.resources.test.js
+packages/lib/services/synchronizer/Synchronizer.resources.test.js.map
+packages/lib/services/synchronizer/Synchronizer.revisions.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.revisions.test.js
+packages/lib/services/synchronizer/Synchronizer.revisions.test.js.map
+packages/lib/services/synchronizer/Synchronizer.sharing.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.sharing.test.js
+packages/lib/services/synchronizer/Synchronizer.sharing.test.js.map
+packages/lib/services/synchronizer/Synchronizer.tags.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.tags.test.js
+packages/lib/services/synchronizer/Synchronizer.tags.test.js.map
+packages/lib/services/synchronizer/Synchronizer.tools.test.d.ts
+packages/lib/services/synchronizer/Synchronizer.tools.test.js
+packages/lib/services/synchronizer/Synchronizer.tools.test.js.map
 packages/lib/services/synchronizer/gui/useSyncTargetUpgrade.d.ts
 packages/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
 packages/lib/services/synchronizer/gui/useSyncTargetUpgrade.js.map
@@ -1335,6 +1395,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/synchronizer_LockHandler.test.d.ts
+packages/lib/services/synchronizer/synchronizer_LockHandler.test.js
+packages/lib/services/synchronizer/synchronizer_LockHandler.test.js.map
+packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.d.ts
+packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js
+packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js.map
 packages/lib/services/synchronizer/tools.d.ts
 packages/lib/services/synchronizer/tools.js
 packages/lib/services/synchronizer/tools.js.map
@@ -1347,6 +1413,12 @@ packages/lib/services/synchronizer/utils/types.js.map
 packages/lib/shim.d.ts
 packages/lib/shim.js
 packages/lib/shim.js.map
+packages/lib/testing/test-utils-synchronizer.d.ts
+packages/lib/testing/test-utils-synchronizer.js
+packages/lib/testing/test-utils-synchronizer.js.map
+packages/lib/testing/test-utils.d.ts
+packages/lib/testing/test-utils.js
+packages/lib/testing/test-utils.js.map
 packages/lib/theme.d.ts
 packages/lib/theme.js
 packages/lib/theme.js.map
@@ -1380,6 +1452,9 @@ packages/lib/themes/type.js.map
 packages/lib/time.d.ts
 packages/lib/time.js
 packages/lib/time.js.map
+packages/lib/utils/credentialFiles.d.ts
+packages/lib/utils/credentialFiles.js
+packages/lib/utils/credentialFiles.js.map
 packages/lib/uuid.d.ts
 packages/lib/uuid.js
 packages/lib/uuid.js.map
@@ -1506,6 +1581,9 @@ packages/tools/generate-database-types.js.map
 packages/tools/lerna-add.d.ts
 packages/tools/lerna-add.js
 packages/tools/lerna-add.js.map
+packages/tools/release-android.d.ts
+packages/tools/release-android.js
+packages/tools/release-android.js.map
 packages/tools/release-cli.d.ts
 packages/tools/release-cli.js
 packages/tools/release-cli.js.map
--- a/DEPLOY.md
+++ b/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`
--- a/12
+++ b/12
@@ -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
--- a/README.md
+++ b/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:

@@ -292,7 +292,7 @@ To add a **Bucket Policy** from the AWS S3 Web Console, navigate to the **Permis
                  "s3:DeleteObject",
                  "s3:DeleteObjectVersion",
                  "s3:PutObject"
-            ]
+            ],
            "Resource": [
                "arn:aws:s3:::joplin-bucket",
                "arn:aws:s3:::joplin-bucket/*"
@@ -342,7 +342,7 @@ In the desktop and mobile apps, an alarm can be associated with any to-do. It wi

 - **Windows**: >= 8. Make sure the Action Center is enabled on Windows. Task bar balloon for Windows < 8. Growl as fallback. Growl takes precedence over Windows balloons.
 - **macOS**: >= 10.8 or Growl if earlier.
- **Linux**: `notify-osd` or `libnotify-bin` installed (Ubuntu should have this by default). Growl otherwise
+- **Linux**: `notify-send` tool, delivered through packages `notify-osd`, `libnotify-bin` or `libnotify-tools`. GNOME should have this by default, but install `libnotify-tools` if using KDE Plasma.

 See [documentation and flow chart for reporter choice](https://github.com/mikaelbr/node-notifier/blob/master/DECISION_FLOW.md)

@@ -511,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 O](mailto:Whaell@protonmail.com)  |  99%
-![](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)  |  74%
-![](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)  |    |  60%
-![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  jmontane, 2019  |  85%
-![](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)  |  89%
+![](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)  |  96%
+![](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  |  30%
+![](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)  |  75%
+![](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)  |    |  58%
+![](https://joplinapp.org/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  jmontane, 2019  |  83%
+![](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)  |  96%
+![](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)  |  86%
 ![](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:  |  96%
-![](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/de.png)  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [Atalanttore](mailto:atalanttore@googlemail.com)  |  95%
+![](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)  |    |  57%
 ![](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)  |  97%
-![](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)  |  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  |  95%
-![](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)  |  96%
-![](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)  |  91%
-![](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)  |    |  95%
-![](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)  |  98%
-![](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)  |  74%
-![](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)  |  99%
-![](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)  |    |  47%
-![](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)  |  85%
-![](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)  |  97%
+![](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)  |  94%
+![](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  |  94%
+![](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  |  99%
+![](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)  |  38%
+![](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)  |  93%
+![](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)  |  88%
+![](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)  |    |  92%
+![](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)  |  95%
+![](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)  |  76%
+![](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)  |  71%
+![](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)  |  94%
+![](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)  |  94%
+![](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)  |  94%
+![](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)  |  66%
+![](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)  |  96%
+![](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)  |  61%
+![](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)  |    |  45%
+![](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)  |    |  73%
+![](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)  |  94%
+![](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)  |  94%
+![](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)  |  97%
+![](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)  |  94%
+![](https://joplinapp.org/images/flags/country-4x3/rs.png)  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  71%
+![](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)  |  94%
+![](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)  |  97%
+![](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)  |  96%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->

 # Contributors
--- a/docker-compose.server.yml
+++ b/docker-compose.server.yml
@@ -9,6 +9,8 @@ version: '3'
 services:
    db:
        image: postgres:13.1
+        volumes:
+            - ./data/postgres:/var/lib/postgresql/data
        ports:
            - "5432:5432"
        restart: unless-stopped
--- a/docs/api/references/plugin_api/interfaces/command.html
+++ b/docs/api/references/plugin_api/interfaces/command.html
@@ -108,11 +108,12 @@
 					</aside>
 					<div class="tsd-comment tsd-typography">
 						<div class="lead">
-							<p>Defines whether the command should be enabled or disabled, which in turns affects
-							the enabled state of any associated button or menu item.</p>
+							<p>Defines whether the command should be enabled or disabled, which in turns
+							affects the enabled state of any associated button or menu item.</p>
 						</div>
-						<p>The condition should be expressed as a &quot;when-clause&quot; (as in Visual Studio Code). It&#39;s a simple boolean expression that evaluates to
-						<code>true</code> or <code>false</code>. It supports the following operators:</p>
+						<p>The condition should be expressed as a &quot;when-clause&quot; (as in Visual Studio
+							Code). It&#39;s a simple boolean expression that evaluates to <code>true</code> or
+						<code>false</code>. It supports the following operators:</p>
 						<table>
 							<thead>
 								<tr>
@@ -142,7 +143,17 @@
 									<td>&quot;oneNoteSelected &amp;&amp; !inConflictFolder&quot;</td>
 								</tr>
 						</tbody></table>
-						<p>Currently the supported context variables aren&#39;t documented, but you can <a href="https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts">find the list here</a>.</p>
+						<p>Joplin, unlike VSCode, also supports parenthesis, which allows creating
+							more complex expressions such as <code>cond1 || (cond2 &amp;&amp; cond3)</code>. Only one
+						level of parenthesis is possible (nested ones aren&#39;t supported).</p>
+						<p>Currently the supported context variables aren&#39;t documented, but you can
+						find the list below:</p>
+						<ul>
+							<li>[Global When
+							Clauses](<a href="https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts">https://github.com/laurent22/joplin/blob/dev/packages/lib/services/commands/stateToWhenClauseContext.ts</a>).</li>
+							<li>[Desktop app When
+							Clauses](<a href="https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts">https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/services/commands/stateToWhenClauseContext.ts</a>).</li>
+						</ul>
 						<p>Note: Commands are enabled by default unless you use this property.</p>
 					</div>
 				</section>
--- a/docs/api/references/rest_api/index.html
+++ b/docs/api/references/rest_api/index.html
@@ -721,6 +721,11 @@ async function fetchAllNotes() {
 <td></td>
 </tr>
 <tr>
+<td>share_id</td>
+<td>text</td>
+<td></td>
+</tr>
+<tr>
 <td>body_html</td>
 <td>text</td>
 <td>Note body, in HTML format</td>
@@ -842,12 +847,7 @@ async function fetchAllNotes() {
 <td></td>
 </tr>
 <tr>
-<td>is_linked_folder</td>
-<td>int</td>
-<td></td>
-</tr>
-<tr>
-<td>source_folder_owner_id</td>
+<td>share_id</td>
 <td>text</td>
 <td></td>
 </tr>
@@ -947,6 +947,11 @@ async function fetchAllNotes() {
 <td>int</td>
 <td></td>
 </tr>
+<tr>
+<td>share_id</td>
+<td>text</td>
+<td></td>
+</tr>
 </tbody>
 </table>
 <h2>GET /resources<a name="get-resources" href="#get-resources" class="heading-anchor">🔗</a></h2>
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -405,6 +405,46 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.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 changelog<a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.0.2">v2.0.2</a> (Pre-release) - 2021-05-21T18:07:48Z<a name="v2-0-2-https-github-com-laurent22-joplin-releases-tag-v2-0-2-pre-release-2021-05-21t18-07-48z" href="#v2-0-2-https-github-com-laurent22-joplin-releases-tag-v2-0-2-pre-release-2021-05-21t18-07-48z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add Share Notebook menu item (6f2f241)</li>
+<li>New: Add classnames to DOM elements for theming purposes (<a href="https://github.com/laurent22/joplin/issues/4933">#4933</a> by <a href="https://github.com/ajilderda">@ajilderda</a>)</li>
+<li>Improved: Allow unsharing a note (f7d164b)</li>
+<li>Improved: Displays error info when Joplin Server fails (3f0586e)</li>
+<li>Improved: Handle too large items for Joplin Server (d29624c)</li>
+<li>Improved: Import SVG as images when importing ENEX files (<a href="https://github.com/laurent22/joplin/issues/4968">#4968</a>)</li>
+<li>Improved: Import linked local files when importing Markdown files (<a href="https://github.com/laurent22/joplin/issues/4966">#4966</a>) (<a href="https://github.com/laurent22/joplin/issues/4433">#4433</a> by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>Improved: Improved usability when plugin repository cannot be connected to (<a href="https://github.com/laurent22/joplin/issues/4462">#4462</a>)</li>
+<li>Improved: Made sync more reliable by making it skip items that time out, and improved sync status screen (15fe119)</li>
+<li>Improved: Pass custom CSS property to all export handlers and renderers (bd08041)</li>
+<li>Improved: Regression: It was no longer possible to add list items in an empty note (6577f4f)</li>
+<li>Improved: Regression: Pasting plain text in Rich Text editor was broken (9e9bf63)</li>
+<li>Fixed: Fixed issue with empty panels being created by plugins (<a href="https://github.com/laurent22/joplin/issues/4926">#4926</a>)</li>
+<li>Fixed: Fixed pasting HTML in Rich Text editor, and improved pasting plain text (2226b79)</li>
+<li>Fixed: Improved importing Evernote notes that contain codeblocks (<a href="https://github.com/laurent22/joplin/issues/4965">#4965</a>)</li>
+<li>Fixed: Prevent cursor from jumping to top of page when pasting image (<a href="https://github.com/laurent22/joplin/issues/4591">#4591</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.0.1">v2.0.1</a> (Pre-release) - 2021-05-15T13:22:58Z<a name="v2-0-1-https-github-com-laurent22-joplin-releases-tag-v2-0-1-pre-release-2021-05-15t13-22-58z" href="#v2-0-1-https-github-com-laurent22-joplin-releases-tag-v2-0-1-pre-release-2021-05-15t13-22-58z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for sharing notebooks with Joplin Server (<a href="https://github.com/laurent22/joplin/issues/4772">#4772</a>)</li>
+<li>New: Add new date format YYMMDD (<a href="https://github.com/laurent22/joplin/issues/4954">#4954</a> by Helmut K. C. Tessarek)</li>
+<li>New: Added button to skip an application update (a31b402)</li>
+<li>Fixed: Display proper error message when JEX file is corrupted (<a href="https://github.com/laurent22/joplin/issues/4958">#4958</a>)</li>
+<li>Fixed: Show or hide completed todos in search results based on user settings (<a href="https://github.com/laurent22/joplin/issues/4951">#4951</a>) (<a href="https://github.com/laurent22/joplin/issues/4581">#4581</a> by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>Fixed: Solve &quot;Resource Id not provided&quot; error (<a href="https://github.com/laurent22/joplin/issues/4943">#4943</a>) (<a href="https://github.com/laurent22/joplin/issues/4891">#4891</a> by <a href="https://github.com/Subhra264">@Subhra264</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.8.5">v1.8.5</a> - 2021-05-10T11:58:14Z<a name="v1-8-5-https-github-com-laurent22-joplin-releases-tag-v1-8-5-2021-05-10t11-58-14z" href="#v1-8-5-https-github-com-laurent22-joplin-releases-tag-v1-8-5-2021-05-10t11-58-14z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fixed pasting of text and images from Word on Windows (<a href="https://github.com/laurent22/joplin/issues/4916">#4916</a>)</li>
+<li>Security: Filter out NOSCRIPT tags that could be used to cause an XSS (found by <a href="https://twitter.com/jubairfolder">Jubair Rehman Yousafzai</a>) (9c20d59)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.8.4">v1.8.4</a> (Pre-release) - 2021-05-09T18:05:05Z<a name="v1-8-4-https-github-com-laurent22-joplin-releases-tag-v1-8-4-pre-release-2021-05-09t18-05-05z" href="#v1-8-4-https-github-com-laurent22-joplin-releases-tag-v1-8-4-pre-release-2021-05-09t18-05-05z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Improve display of release notes for new versions (f76f99b)</li>
+<li>Fixed: Ensure that image paths that contain spaces are pasted correctly in the Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/4916">#4916</a>)</li>
+<li>Fixed: Make sure sync startup operations are cleared after startup (<a href="https://github.com/laurent22/joplin/issues/4919">#4919</a>)</li>
+<li>Security: Apply npm audit security fixes (0b67446)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/v1.8.3">v1.8.3</a> (Pre-release) - 2021-05-04T10:38:16Z<a name="v1-8-3-https-github-com-laurent22-joplin-releases-tag-v1-8-3-pre-release-2021-05-04t10-38-16z" href="#v1-8-3-https-github-com-laurent22-joplin-releases-tag-v1-8-3-pre-release-2021-05-04t10-38-16z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add &quot;id&quot; and &quot;due&quot; search filters (<a href="https://github.com/laurent22/joplin/issues/4898">#4898</a> by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
--- a/docs/changelog_android/index.html
+++ b/docs/changelog_android/index.html
@@ -0,0 +1,443 @@
+<!doctype html>
+<html>
+
+<!--
+
+!!! WARNING !!!
+
+This file was auto-generated from readme/changelog_android.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/changelog_android.md
+
+-->
+
+<head>
+	<title>Joplin Android app changelog | 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-changelog_android">
+
+<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>Joplin Android app changelog<a name="joplin-android-app-changelog" href="#joplin-android-app-changelog" class="heading-anchor">🔗</a></h1>
+
+		<div class="bottom-links">
+			<a href="https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.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>
--- a/docs/changelog_cli/index.html
+++ b/docs/changelog_cli/index.html
@@ -405,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>
--- a/docs/changelog_server/index.html
+++ b/docs/changelog_server/index.html
@@ -405,6 +405,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.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 Server Changelog<a name="joplin-server-changelog" href="#joplin-server-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.1">server-v2.0.1</a> (Pre-release) - 2021-05-14T13:55:45Z<a name="server-v2-0-1-https-github-com-laurent22-joplin-releases-tag-server-v2-0-1-pre-release-2021-05-14t13-55-45z" href="#server-v2-0-1-https-github-com-laurent22-joplin-releases-tag-server-v2-0-1-pre-release-2021-05-14t13-55-45z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for sharing notes via a link (ccbc329)</li>
+<li>New: Add support for sharing a folder (#4772)</li>
+<li>New: Added log page to view latest changes to files (874f301)</li>
+<li>Fixed: Prevent new user password from being hashed twice (76c143e)</li>
+<li>Fixed: Fixed crash when rendering note with links to non-existing resources or notes (07484de)</li>
+<li>Fixed: Fixed error handling when no session is provided (63a5bfa)</li>
+<li>Fixed: Fixed uploading empty file to the API (#4402)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v1.7.2">server-v1.7.2</a> - 2021-01-24T19:11:10Z<a name="server-v1-7-2-https-github-com-laurent22-joplin-releases-tag-server-v1-7-2-2021-01-24t19-11-10z" href="#server-v1-7-2-https-github-com-laurent22-joplin-releases-tag-server-v1-7-2-2021-01-24t19-11-10z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fixed password hashing when changing password</li>
--- a/docs/faq/index.html
+++ b/docs/faq/index.html
@@ -455,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>
--- a/docs/index.html
+++ b/docs/index.html
@@ -424,19 +424,19 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.7.11/Joplin-Setup-1.7.11.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
+<td><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></td>
 </tr>
 <tr>
 <td>macOS</td>
-<td><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></td>
+<td><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></td>
 </tr>
 <tr>
 <td>Linux</td>
-<td><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></td>
+<td><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></td>
 </tr>
 </tbody>
 </table>
-<p><strong>On Windows</strong>, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v1.7.11/JoplinPortable.exe'>Portable version</a>. The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</p>
+<p><strong>On Windows</strong>, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v1.8.5/JoplinPortable.exe'>Portable version</a>. The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</p>
 <p><strong>On Linux</strong>, the recommended way is to use the following installation script as it will handle the desktop icon too:</p>
 <pre><code style="word-break: break-all">wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh | bash</code></pre>
 <h2>Mobile applications<a name="mobile-applications" href="#mobile-applications" class="heading-anchor">🔗</a></h2>
@@ -662,7 +662,7 @@ Joplin is also capable of exporting to a number of other formats including HTML
                  &quot;s3:DeleteObject&quot;,
                  &quot;s3:DeleteObjectVersion&quot;,
                  &quot;s3:PutObject&quot;
-            ]
+            ],
            &quot;Resource&quot;: [
                &quot;arn:aws:s3:::joplin-bucket&quot;,
                &quot;arn:aws:s3:::joplin-bucket/*&quot;
@@ -692,7 +692,7 @@ Joplin is also capable of exporting to a number of other formats including HTML
 <ul>
 <li><strong>Windows</strong>: &gt;= 8. Make sure the Action Center is enabled on Windows. Task bar balloon for Windows &lt; 8. Growl as fallback. Growl takes precedence over Windows balloons.</li>
 <li><strong>macOS</strong>: &gt;= 10.8 or Growl if earlier.</li>
-<li><strong>Linux</strong>: <code>notify-osd</code> or <code>libnotify-bin</code> installed (Ubuntu should have this by default). Growl otherwise</li>
+<li><strong>Linux</strong>: <code>notify-send</code> tool, delivered through packages <code>notify-osd</code>, <code>libnotify-bin</code> or <code>libnotify-tools</code>. GNOME should have this by default, but install <code>libnotify-tools</code> if using KDE Plasma.</li>
 </ul>
 <p>See <a href="https://github.com/mikaelbr/node-notifier/blob/master/DECISION_FLOW.md">documentation and flow chart for reporter choice</a></p>
 <p>On mobile, the alarms will be displayed using the built-in notification system.</p>
@@ -989,49 +989,49 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <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 O</a></td>
-<td>99%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/basque_country.png" alt=""></td>
 <td>Basque</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po">eu</a></td>
 <td>juan.abasolo@ehu.eus</td>
-<td>31%</td>
+<td>30%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ba.png" alt=""></td>
 <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>74%</td>
+<td>75%</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>60%</td>
+<td>58%</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>85%</td>
+<td>83%</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>99%</td>
+<td>96%</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>89%</td>
+<td>86%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/dk.png" alt=""></td>
@@ -1045,14 +1045,14 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <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@googlemail.com">Atalanttore</a></td>
-<td>98%</td>
+<td>95%</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>58%</td>
+<td>57%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gb.png" alt=""></td>
@@ -1073,203 +1073,203 @@ 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>97%</td>
+<td>94%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/esperanto.png" alt=""></td>
 <td>Esperanto</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po">eo</a></td>
 <td>Marton Paulo</td>
-<td>34%</td>
+<td>33%</td>
 </tr>
 <tr>
 <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>mrkaato</td>
-<td>97%</td>
+<td>94%</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>95%</td>
+<td>99%</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>39%</td>
+<td>38%</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:42007357+eresytter@users.noreply.github.com">eresytter</a></td>
-<td>96%</td>
+<td>93%</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>97%</td>
+<td>94%</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>91%</td>
+<td>88%</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>95%</td>
+<td>92%</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>98%</td>
+<td>95%</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>78%</td>
+<td>76%</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>74%</td>
+<td>71%</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>97%</td>
+<td>94%</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>97%</td>
+<td>94%</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>97%</td>
+<td>94%</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>68%</td>
+<td>66%</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><a href="mailto:martin.korelic@protonmail.com">Martin Korelič</a></td>
-<td>99%</td>
+<td>96%</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>63%</td>
+<td>61%</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>47%</td>
+<td>45%</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>75%</td>
+<td>73%</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>97%</td>
+<td>94%</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>97%</td>
+<td>94%</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>85%</td>
+<td>97%</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>97%</td>
+<td>94%</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>73%</td>
+<td>71%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cn.png" alt=""></td>
 <td>中文 (简体)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po">zh_CN</a></td>
 <td><a href="mailto:zyangmath@gmail.com">Yang Zhang</a></td>
-<td>97%</td>
+<td>94%</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>95%</td>
+<td>92%</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>98%</td>
+<td>97%</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>97%</td>
+<td>96%</td>
 </tr>
 </tbody>
 </table>
--- a/docs/schema/settings.json
+++ b/docs/schema/settings.json
@@ -17,7 +17,7 @@
 		"sync.target": {
 			"type": "integer",
 			"default": 7,
-			"description": "Synchronisationsziel",
+			"description": "Synchronisation target",
 			"enum": [
 				2,
 				3,
@@ -41,44 +41,44 @@
 		"sync.2.path": {
 			"type": "string",
 			"default": "",
-			"description": "Verzeichnis, mit dem synchronisiert werden soll (absoluter Pfad). Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "Directory to synchronise with (absolute path). Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.5.path": {
 			"type": "string",
 			"default": "",
-			"description": "Nextcloud-WebDAV-URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "Nextcloud WebDAV URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.5.username": {
 			"type": "string",
 			"default": "",
-			"description": "Nextcloud-Benutzername"
+			"description": "Nextcloud username"
 		},
 		"sync.5.password": {
 			"type": "string",
 			"default": "",
-			"description": "Nextcloud-Passwort",
+			"description": "Nextcloud password",
 			"$comment": "private"
 		},
 		"sync.6.path": {
 			"type": "string",
 			"default": "",
-			"description": "WebDAV-URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "WebDAV URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.6.username": {
 			"type": "string",
 			"default": "",
-			"description": "WebDAV-Benutzername"
+			"description": "WebDAV username"
 		},
 		"sync.6.password": {
 			"type": "string",
 			"default": "",
-			"description": "WebDAV-Passwort",
+			"description": "WebDAV password",
 			"$comment": "private"
 		},
 		"sync.8.path": {
 			"type": "string",
 			"default": "",
-			"description": "Amazon S3-Bucket. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "AWS S3 bucket. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.8.url": {
 			"type": "string",
@@ -88,33 +88,28 @@
 		"sync.8.username": {
 			"type": "string",
 			"default": "",
-			"description": "AWS-Schlüssel"
+			"description": "AWS key"
 		},
 		"sync.8.password": {
 			"type": "string",
 			"default": "",
-			"description": "AWS-Geheimnis",
+			"description": "AWS secret",
 			"$comment": "private"
 		},
 		"sync.9.path": {
 			"type": "string",
 			"default": "",
-			"description": "Joplin-Server-URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
-		},
-		"sync.9.directory": {
-			"type": "string",
-			"default": "Apps/Joplin",
-			"description": "Joplin-Server-Verzeichnis"
+			"description": "Joplin Server URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.9.username": {
 			"type": "string",
 			"default": "",
-			"description": "Joplin-Server-Benutzername"
+			"description": "Joplin Server email"
 		},
 		"sync.9.password": {
 			"type": "string",
 			"default": "",
-			"description": "Joplin-Server-Passwort",
+			"description": "Joplin Server password",
 			"$comment": "private"
 		},
 		"sync.5.syncTargets": {
@@ -125,7 +120,7 @@
 		"sync.resourceDownloadMode": {
 			"type": "string",
 			"default": "always",
-			"description": "Verhalten für das Herunterladen von Anhängen. Im Modus „Manuell“ werden die Anhänge nur heruntergeladen, wenn du auf sie klickst. Bei „Automatisch“ werden sie heruntergeladen, sobald du die Notiz öffnest. Bei „Immer“ werden die Anhänge heruntergeladen, egal ob du die Notiz öffnest oder nicht.",
+			"description": "Attachment download behaviour. In \"Manual\" mode, attachments are downloaded only when you click on them. In \"Auto\", they are downloaded when you open the note. In \"Always\", all the attachments are downloaded whether you open the note or not.",
 			"enum": [
 				"always",
 				"manual",
@@ -200,7 +195,7 @@
 		"sync.maxConcurrentConnections": {
 			"type": "integer",
 			"default": 5,
-			"description": "Maximale Anzahl an gleichzeitigen Verbindungen",
+			"description": "Max concurrent connections",
 			"minimum": 1,
 			"maximum": 20
 		},
@@ -222,7 +217,7 @@
 		"locale": {
 			"type": "string",
 			"default": "en_GB",
-			"description": "Sprache",
+			"description": "Language",
 			"enum": [
 				"ar",
 				"eu",
@@ -270,7 +265,7 @@
 		"dateFormat": {
 			"type": "string",
 			"default": "DD/MM/YYYY",
-			"description": "Datumsformat",
+			"description": "Date format",
 			"enum": [
 				"DD/MM/YYYY",
 				"DD/MM/YY",
@@ -278,13 +273,14 @@
 				"MM/DD/YY",
 				"YYYY-MM-DD",
 				"DD.MM.YYYY",
-				"YYYY.MM.DD"
+				"YYYY.MM.DD",
+				"YYMMDD"
 			]
 		},
 		"timeFormat": {
 			"type": "string",
 			"default": "HH:mm",
-			"description": "Zeitformat",
+			"description": "Time format",
 			"enum": [
 				"HH:mm",
 				"h:mm A"
@@ -293,7 +289,7 @@
 		"theme": {
 			"type": "integer",
 			"default": 1,
-			"description": "Design",
+			"description": "Theme",
 			"enum": [
 				1,
 				2,
@@ -308,12 +304,12 @@
 		"themeAutoDetect": {
 			"type": "boolean",
 			"default": false,
-			"description": "Automatisch das Design ändern, um es dem System-Design anzupassen"
+			"description": "Automatically switch theme to match system theme"
 		},
 		"preferredLightTheme": {
 			"type": "integer",
 			"default": 1,
-			"description": "Bevorzugtes helles Design",
+			"description": "Preferred light theme",
 			"enum": [
 				1,
 				2,
@@ -328,7 +324,7 @@
 		"preferredDarkTheme": {
 			"type": "integer",
 			"default": 2,
-			"description": "Bevorzugtes dunkles Design",
+			"description": "Preferred dark theme",
 			"enum": [
 				1,
 				2,
@@ -348,7 +344,7 @@
 		"showNoteCounts": {
 			"type": "boolean",
 			"default": true,
-			"description": "Notizanzahl anzeigen",
+			"description": "Show note counts",
 			"$comment": "private"
 		},
 		"layoutButtonSequence": {
@@ -365,17 +361,17 @@
 		"uncompletedTodosOnTop": {
 			"type": "boolean",
 			"default": true,
-			"description": "Unvollständige Aufgaben oben"
+			"description": "Uncompleted to-dos on top"
 		},
 		"showCompletedTodos": {
 			"type": "boolean",
 			"default": true,
-			"description": "Abgeschlossene Aufgaben anzeigen"
+			"description": "Show completed to-dos"
 		},
 		"notes.sortOrder.field": {
 			"type": "string",
 			"default": "user_updated_time",
-			"description": "Sortiere Notizen nach",
+			"description": "Sort notes by",
 			"enum": [
 				"user_updated_time",
 				"user_created_time",
@@ -386,17 +382,17 @@
 		"editor.autoMatchingBraces": {
 			"type": "boolean",
 			"default": true,
-			"description": "Automatisches Hinzufügen von geschweiften Klammern, runden Klammern, Anführungszeichen usw."
+			"description": "Auto-pair braces, parenthesis, quotations, etc."
 		},
 		"notes.sortOrder.reverse": {
 			"type": "boolean",
 			"default": true,
-			"description": "Sortierreihenfolge umkehren"
+			"description": "Reverse sort order"
 		},
 		"folders.sortOrder.field": {
 			"type": "string",
 			"default": "title",
-			"description": "Notizbücher sortieren nach",
+			"description": "Sort notebooks by",
 			"enum": [
 				"title",
 				"last_note_user_updated_time"
@@ -405,12 +401,12 @@
 		"folders.sortOrder.reverse": {
 			"type": "boolean",
 			"default": false,
-			"description": "Sortierreihenfolge umkehren"
+			"description": "Reverse sort order"
 		},
 		"trackLocation": {
 			"type": "boolean",
 			"default": true,
-			"description": "Momentanen Standort zusammen mit Notizen speichern"
+			"description": "Save geo-location with notes"
 		},
 		"editor.beta": {
 			"type": "boolean",
@@ -421,7 +417,7 @@
 		"newTodoFocus": {
 			"type": "string",
 			"default": "title",
-			"description": "Wenn eine neue Aufgabe erstellt wird:",
+			"description": "When creating a new to-do:",
 			"enum": [
 				"title",
 				"body"
@@ -430,7 +426,7 @@
 		"newNoteFocus": {
 			"type": "string",
 			"default": "body",
-			"description": "Wenn eine neue Notiz erstellt wird:",
+			"description": "When creating a new note:",
 			"enum": [
 				"title",
 				"body"
@@ -459,107 +455,107 @@
 		"markdown.plugin.softbreaks": {
 			"type": "boolean",
 			"default": false,
-			"description": "Weiche Zeilenumbrüche aktivieren"
+			"description": "Enable soft breaks"
 		},
 		"markdown.plugin.typographer": {
 			"type": "boolean",
 			"default": false,
-			"description": "Typographie-Unterstützung aktivieren"
+			"description": "Enable typographer support"
 		},
 		"markdown.plugin.linkify": {
 			"type": "boolean",
 			"default": true,
-			"description": "Linkify aktivieren"
+			"description": "Enable Linkify"
 		},
 		"markdown.plugin.katex": {
 			"type": "boolean",
 			"default": true,
-			"description": "Mathematische Ausdrücke aktivieren"
+			"description": "Enable math expressions"
 		},
 		"markdown.plugin.fountain": {
 			"type": "boolean",
 			"default": false,
-			"description": "Fountain-Syntaxunterstützung aktivieren"
+			"description": "Enable Fountain syntax support"
 		},
 		"markdown.plugin.mermaid": {
 			"type": "boolean",
 			"default": true,
-			"description": "Mermaid-Diagrammunterstützung aktivieren"
+			"description": "Enable Mermaid diagrams support"
 		},
 		"markdown.plugin.audioPlayer": {
 			"type": "boolean",
 			"default": true,
-			"description": "Audiospieler aktivieren"
+			"description": "Enable audio player"
 		},
 		"markdown.plugin.videoPlayer": {
 			"type": "boolean",
 			"default": true,
-			"description": "Videospieler aktivieren"
+			"description": "Enable video player"
 		},
 		"markdown.plugin.pdfViewer": {
 			"type": "boolean",
 			"default": true,
-			"description": "PDF-Betrachter aktivieren"
+			"description": "Enable PDF viewer"
 		},
 		"markdown.plugin.mark": {
 			"type": "boolean",
 			"default": true,
-			"description": "Syntax ==mark== aktivieren"
+			"description": "Enable ==mark== syntax"
 		},
 		"markdown.plugin.footnote": {
 			"type": "boolean",
 			"default": true,
-			"description": "Fußnoten aktivieren"
+			"description": "Enable footnotes"
 		},
 		"markdown.plugin.toc": {
 			"type": "boolean",
 			"default": true,
-			"description": "Inhaltsverzeichnis-Erweiterung aktivieren"
+			"description": "Enable table of contents extension"
 		},
 		"markdown.plugin.sub": {
 			"type": "boolean",
 			"default": false,
-			"description": "Syntax ~sub~ aktivieren"
+			"description": "Enable ~sub~ syntax"
 		},
 		"markdown.plugin.sup": {
 			"type": "boolean",
 			"default": false,
-			"description": "Syntax ^sup^ aktivieren"
+			"description": "Enable ^sup^ syntax"
 		},
 		"markdown.plugin.deflist": {
 			"type": "boolean",
 			"default": false,
-			"description": "Syntax deflist aktivieren"
+			"description": "Enable deflist syntax"
 		},
 		"markdown.plugin.abbr": {
 			"type": "boolean",
 			"default": false,
-			"description": "Abkürzungssyntax aktivieren"
+			"description": "Enable abbreviation syntax"
 		},
 		"markdown.plugin.emoji": {
 			"type": "boolean",
 			"default": false,
-			"description": "Markdown Emoji aktivieren"
+			"description": "Enable markdown emoji"
 		},
 		"markdown.plugin.insert": {
 			"type": "boolean",
 			"default": false,
-			"description": "Syntax ++insert++ aktivieren"
+			"description": "Enable ++insert++ syntax"
 		},
 		"markdown.plugin.multitable": {
 			"type": "boolean",
 			"default": false,
-			"description": "Multimarkdown Tabellenerweiterung aktivieren"
+			"description": "Enable multimarkdown table extension"
 		},
 		"showTrayIcon": {
 			"type": "boolean",
 			"default": true,
-			"description": "Taskleistensymbol anzeigen. Dadurch kann Joplin im Hintergrund laufen. Es wird empfohlen, diese Einstellung zu aktivieren, damit deine Notizen ständig synchronisiert werden und somit die Anzahl der Konflikte reduziert wird."
+			"description": "Show tray icon. This will allow Joplin to run in the background. It is recommended to enable this setting so that your notes are constantly being synchronised, thus reducing the number of conflicts."
 		},
 		"startMinimized": {
 			"type": "boolean",
 			"default": false,
-			"description": "Anwendung minimiert als Taskleistensymbol starten"
+			"description": "Start application minimised in the tray icon"
 		},
 		"collapsedFolderIds": {
 			"type": "array",
@@ -601,6 +597,11 @@
 			"default": -1,
 			"$comment": "private"
 		},
+		"sync.userId": {
+			"type": "string",
+			"default": "",
+			"$comment": "private"
+		},
 		"style.zoom": {
 			"type": "integer",
 			"default": 100,
@@ -611,19 +612,19 @@
 		"style.editor.fontSize": {
 			"type": "integer",
 			"default": 13,
-			"description": "Schriftgröße im Editor",
+			"description": "Editor font size",
 			"minimum": 4,
 			"maximum": 50
 		},
 		"style.editor.fontFamily": {
 			"type": "string",
 			"default": "",
-			"description": "Schriftfamilie im Editor. Used for most text in the markdown editor. If not found, a generic proportional (variable width) font is used."
+			"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": "Nichtproportionale Schriftfamilie im Editor. 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."
+			"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",
@@ -632,13 +633,13 @@
 		},
 		"autoUpdateEnabled": {
 			"type": "boolean",
-			"default": false,
-			"description": "Die Anwendung automatisch aktualisieren"
+			"default": true,
+			"description": "Automatically update the application"
 		},
 		"autoUpdate.includePreReleases": {
 			"type": "boolean",
 			"default": false,
-			"description": "Bei der Suche nach Aktualisierungen Vorabveröffentlichungen erhalten. Weitere Informationen findest Du auf der Vorabversionsseite: https://joplinapp.org/prereleases"
+			"description": "Get pre-releases when checking for updates. See the pre-release page for more details: https://joplinapp.org/prereleases"
 		},
 		"clipperServer.autoStart": {
 			"type": "boolean",
@@ -648,7 +649,7 @@
 		"sync.interval": {
 			"type": "integer",
 			"default": 300,
-			"description": "Synchronisationsintervall",
+			"description": "Synchronisation interval",
 			"enum": [
 				0,
 				300,
@@ -662,7 +663,7 @@
 		"sync.mobileWifiOnly": {
 			"type": "boolean",
 			"default": false,
-			"description": "Nur über WiFi-Verbindung synchronisieren"
+			"description": "Synchronise only over WiFi connection"
 		},
 		"noteVisiblePanes": {
 			"type": "array",
@@ -685,12 +686,12 @@
 		"editor": {
 			"type": "string",
 			"default": "",
-			"description": "Texteditor-Befehl. Der Editor-Befehl (kann Kommandozeilenargumente enthalten), der zum Öffnen einer Notiz verwendet wird. Wenn keiner angegeben wird, wird versucht, den Standard-Editor automatisch zu erkennen."
+			"description": "Text editor command. The editor command (may include arguments) that will be used to open a note. If none is provided it will try to auto-detect the default editor."
 		},
 		"export.pdfPageSize": {
 			"type": "string",
 			"default": "A4",
-			"description": "Seitengröße für den PDF-Export",
+			"description": "Page size for PDF export",
 			"enum": [
 				"A4",
 				"Letter",
@@ -703,7 +704,7 @@
 		"export.pdfPageOrientation": {
 			"type": "string",
 			"default": "portrait",
-			"description": "Seitenausrichtung für den PDF-Export",
+			"description": "Page orientation for PDF export",
 			"enum": [
 				"portrait",
 				"landscape"
@@ -712,7 +713,7 @@
 		"editor.keyboardMode": {
 			"type": "string",
 			"default": "",
-			"description": "Tastatur-Modus",
+			"description": "Keyboard Mode",
 			"enum": [
 				"",
 				"emacs",
@@ -728,17 +729,17 @@
 		"net.customCertificates": {
 			"type": "string",
 			"default": "",
-			"description": "Benutzerdefinierte TLS-Zertifikate. Kommagetrennte Liste von Pfaden zu Verzeichnissen, aus denen die Zertifikate geladen werden, oder Pfad zu einzelnen Zertifikatsdateien. Zum Beispiel: /my/cert_dir, /other/custom.pem. Wenn du Änderungen an den TLS-Einstellungen vornimmst, musst du deine Änderungen speichern, bevor du auf „Synchronisierungskonfiguration prüfen“ klickst."
+			"description": "Custom TLS certificates. Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem. Note that if you make changes to the TLS settings, you must save your changes before clicking on \"Check synchronisation configuration\"."
 		},
 		"net.ignoreTlsErrors": {
 			"type": "boolean",
 			"default": false,
-			"description": "TLS-Zertifikatfehler ignorieren"
+			"description": "Ignore TLS certificate errors"
 		},
 		"sync.wipeOutFailSafe": {
 			"type": "boolean",
 			"default": true,
-			"description": "Ausfallsicher. Ausfallsicher: Lösche nicht die lokalen Daten, wenn das Synchronisationsziel leer ist (oft ein Resultat von Fehlkonfiguration oder einem Programmfehler)"
+			"description": "Fail-safe. Fail-safe: Do not wipe out local data when sync target is empty (often the result of a misconfiguration or bug)"
 		},
 		"api.token": {
 			"type": "string",
@@ -748,7 +749,7 @@
 		"api.port": {
 			"type": "integer",
 			"default": null,
-			"description": "Spezifiziere den Port, der vom API-Server verwendet werden soll. Wenn er nicht gesetzt ist, wird ein Standardwert verwendet."
+			"description": "Specify the port that should be used by the API server. If not set, a default will be used."
 		},
 		"resourceService.lastProcessedChangeId": {
 			"type": "integer",
@@ -773,12 +774,12 @@
 		"revisionService.enabled": {
 			"type": "boolean",
 			"default": true,
-			"description": "Notizenverlauf aktivieren"
+			"description": "Enable note history"
 		},
 		"revisionService.ttlDays": {
 			"type": "integer",
 			"default": 90,
-			"description": "Notizenverlauf speichern für",
+			"description": "Keep note history for",
 			"minimum": 1,
 			"maximum": 730
 		},
@@ -832,17 +833,17 @@
 		"layout.folderList.factor": {
 			"type": "integer",
 			"default": 1,
-			"description": "Notizbuch-Listenwachstumsfaktor. Die Faktor-Eigenschaft legt fest, wie der Artikel wächst oder schrumpft, um dem verfügbaren Platz in seinem Container in Bezug auf die anderen Artikel zu entsprechen. Ein Element mit dem Faktor 2 benötigt also doppelt so viel Platz wie ein Element mit dem Faktor 1. Starten Sie die App neu, um Änderungen zu sehen."
+			"description": "Notebook list 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."
 		},
 		"layout.noteList.factor": {
 			"type": "integer",
 			"default": 1,
-			"description": "Notiz-Listenwachstumsfaktor. Die Faktor-Eigenschaft legt fest, wie der Artikel wächst oder schrumpft, um dem verfügbaren Platz in seinem Container in Bezug auf die anderen Artikel zu entsprechen. Ein Element mit dem Faktor 2 benötigt also doppelt so viel Platz wie ein Element mit dem Faktor 1. Starten Sie die App neu, um Änderungen zu sehen."
+			"description": "Note list 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."
 		},
 		"layout.note.factor": {
 			"type": "integer",
 			"default": 2,
-			"description": "Notiz-Flächenwachstumsfaktor. Die Faktor-Eigenschaft legt fest, wie der Artikel wächst oder schrumpft, um dem verfügbaren Platz in seinem Container in Bezug auf die anderen Artikel zu entsprechen. Ein Element mit dem Faktor 2 benötigt also doppelt so viel Platz wie ein Element mit dem Faktor 1. Starten Sie die App neu, um Änderungen zu sehen."
+			"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",
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
--- a/docs/terminal/index.html
+++ b/docs/terminal/index.html
@@ -832,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.
--- a/package.json
+++ b/package.json
@@ -8,9 +8,8 @@
  "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",
+    "bootstrap": "lerna bootstrap --force-local --no-ci",
+    "bootstrapServerOnly": "lerna bootstrap --force-local --no-ci --include-dependents --include-dependencies --scope @joplin/server",
    "build": "lerna run build && npm run tsc",
    "buildApiDoc": "npm start --prefix=packages/app-cli -- apidoc ../../readme/api/references/rest_api.md",
    "buildDoc": "./packages/tools/build-all.sh",
--- a/packages/app-cli/jest.config.js
+++ b/packages/app-cli/jest.config.js
@@ -33,9 +33,7 @@ module.exports = {
 		'<rootDir>/node_modules/',
 		'<rootDir>/tests/support/',
 		'<rootDir>/build/',
-		'<rootDir>/tests/test-utils.js',
-		'<rootDir>/tests/test-utils-synchronizer.js',
-		'<rootDir>/tests/file_api_driver.js',
+		'<rootDir>/tests/testUtils.js',
 		'<rootDir>/tests/tmp/',
 		'<rootDir>/tests/test data/',
 	],
--- a/packages/app-cli/jest.setup.js
+++ b/packages/app-cli/jest.setup.js
@@ -1,4 +1,17 @@
-const { afterEachCleanUp } = require('./tests/test-utils.js');
+const { afterEachCleanUp } = require('@joplin/lib/testing/test-utils.js');
+const { shimInit } = require('@joplin/lib/shim-init-node.js');
+const shim = require('@joplin/lib/shim').default;
+const sharp = require('sharp');
+
+let keytar;
+try {
+	keytar = shim.platformSupportsKeyChain() ? require('keytar') : null;
+} catch (error) {
+	console.error('Cannot load keytar - keychain support will be disabled', error);
+	keytar = null;
+}
+
+shimInit(sharp, keytar);

 global.afterEach(async () => {
 	await afterEachCleanUp();
--- a/packages/app-cli/package.json
+++ b/packages/app-cli/package.json
@@ -5,7 +5,7 @@
  "author": "Laurent Cozic",
  "private": true,
  "scripts": {
-    "test": "jest --config=jest.config.js --bail --forceExit",
+    "test": "jest --verbose=false --config=jest.config.js --bail --forceExit",
    "test-one": "jest --verbose=false --config=jest.config.js --bail --forceExit",
    "test-ci": "jest --config=jest.config.js --forceExit",
    "build": "gulp build",
@@ -31,7 +31,7 @@
    ],
    "owner": "Laurent Cozic"
  },
-  "version": "1.8.1",
+  "version": "2.0.0",
  "bin": {
    "joplin": "./main.js"
  },
@@ -43,7 +43,6 @@
    "@joplin/renderer": "1.8",
    "aws-sdk": "^2.588.0",
    "chalk": "^4.1.0",
-    "clean-html": "^1.5.0",
    "compare-version": "^0.1.2",
    "fs-extra": "^5.0.0",
    "html-entities": "^1.2.1",
--- a/packages/app-cli/tests/EnexToHtml.js
+++ b/packages/app-cli/tests/EnexToHtml.js
@@ -1,116 +0,0 @@
-
-const { setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js');
-const shim = require('@joplin/lib/shim').default;
-const { enexXmlToHtml } = require('@joplin/lib/import-enex-html-gen.js');
-const cleanHtml = require('clean-html');
-
-const fileWithPath = (filename) =>
-	`${__dirname}/enex_to_html/${filename}`;
-
-const audioResource = {
-	filename: 'audio test',
-	id: '9168ee833d03c5ea7c730ac6673978c1',
-	mime: 'audio/x-m4a',
-	size: 82011,
-	title: 'audio test',
-};
-
-// All the test HTML files are beautified ones, so we need to run
-// this before the comparison. Before, beautifying was done by `enexXmlToHtml`
-// but that was removed due to problems with the clean-html package.
-const beautifyHtml = (html) => {
-	return new Promise((resolve) => {
-		try {
-			cleanHtml.clean(html, { wrap: 0 }, (...cleanedHtml) => resolve(cleanedHtml.join('')));
-		} catch (error) {
-			console.warn(`Could not clean HTML - the "unclean" version will be used: ${error.message}: ${html.trim().substr(0, 512).replace(/[\n\r]/g, ' ')}...`);
-			resolve([html].join(''));
-		}
-	});
-};
-
-/**
- * Tests the importer for a single note, checking that the result of
- * processing the given `.enex` input file matches the contents of the given
- * `.html` file.
- *
- * Note that this does not test the importing of an entire exported `.enex`
- * archive, but rather a single node of such a file. Thus, the test data files
- * (e.g. `./enex_to_html/code1.enex`) correspond to the contents of a single
- * `<note>...</note>` node in an `.enex` file already extracted from
- * `<content><![CDATA[...]]</content>`.
- */
-const compareOutputToExpected = (options) => {
-	const inputFile = fileWithPath(`${options.testName}.enex`);
-	const outputFile = fileWithPath(`${options.testName}.html`);
-	const testTitle = `should convert from Enex to Html: ${options.testName}`;
-
-	it(testTitle, (async () => {
-		const enexInput = await shim.fsDriver().readFile(inputFile);
-		const expectedOutput = await shim.fsDriver().readFile(outputFile);
-		const actualOutput = await beautifyHtml(await enexXmlToHtml(enexInput, options.resources));
-
-		expect(actualOutput).toEqual(expectedOutput);
-	}));
-};
-
-describe('EnexToHtml', function() {
-	beforeEach(async (done) => {
-		await setupDatabaseAndSynchronizer(1);
-		await switchClient(1);
-		done();
-	});
-
-	compareOutputToExpected({
-		testName: 'checklist-list',
-		resources: [],
-	});
-
-	compareOutputToExpected({
-		testName: 'svg',
-		resources: [],
-	});
-
-	compareOutputToExpected({
-		testName: 'en-media--image',
-		resources: [{
-			filename: '',
-			id: '89ce7da62c6b2832929a6964237e98e9', // Mock id
-			mime: 'image/jpeg',
-			size: 50347,
-			title: '',
-		}],
-	});
-
-	compareOutputToExpected({
-		testName: 'en-media--audio',
-		resources: [audioResource],
-	});
-
-	compareOutputToExpected({
-		testName: 'attachment',
-		resources: [{
-			filename: 'attachment-1',
-			id: '21ca2b948f222a38802940ec7e2e5de3',
-			mime: 'application/pdf', // Any non-image/non-audio mime type will do
-			size: 1000,
-		}],
-	});
-
-	// it('fails when not given a matching resource', (async () => {
-	// 	// To test the promise-unexpectedly-resolved case, add `audioResource` to the array.
-	// 	const resources = [];
-	// 	const inputFile = fileWithPath('en-media--image.enex');
-	// 	const enexInput = await shim.fsDriver().readFile(inputFile);
-	// 	const promisedOutput = enexXmlToHtml(enexInput, resources);
-
-	// 	promisedOutput.then(() => {
-	// 		// Promise should not be resolved
-	// 		expect(false).toEqual(true);
-	// 	}, (reason) => {
-	// 		expect(reason)
-	// 			.toBe('Hash with no associated resource: 89ce7da62c6b2832929a6964237e98e9');
-	// 	});
-	// }));
-
-});
--- a/packages/app-cli/tests/HtmlToHtml.js
+++ b/packages/app-cli/tests/HtmlToHtml.js
@@ -4,7 +4,7 @@
 const os = require('os');
 const time = require('@joplin/lib/time').default;
 const { filename } = require('@joplin/lib/path-utils');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('@joplin/lib/testing/test-utils.js');
 const Folder = require('@joplin/lib/models/Folder').default;
 const Note = require('@joplin/lib/models/Note').default;
 const BaseModel = require('@joplin/lib/BaseModel').default;
--- a/packages/app-cli/tests/MdToHtml.ts
+++ b/packages/app-cli/tests/MdToHtml.ts
@@ -1,7 +1,7 @@
 import MdToHtml from '@joplin/renderer/MdToHtml';
 const os = require('os');
 const { filename } = require('@joplin/lib/path-utils');
-const { setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js');
+const { setupDatabaseAndSynchronizer, switchClient } = require('@joplin/lib/testing/test-utils.js');
 import shim from '@joplin/lib/shim';
 const { themeStyle } = require('@joplin/lib/theme');

@@ -137,6 +137,14 @@ describe('MdToHtml', function() {
 		}
 	}));

+	it('should render an empty string', (async () => {
+		const mdToHtml = newTestMdToHtml();
+		const result = await mdToHtml.render('', null, { splitted: true });
+		// The TinyMCE component checks for this exact string to apply a hack,
+		// so make sure it doesn't change from version to version.
+		expect(result.html).toBe('<div id="rendered-md"></div>');
+	}));
+
 	it('should split HTML and CSS', (async () => {
 		const mdToHtml = newTestMdToHtml();

--- a/packages/app-cli/tests/MdToMd.ts
+++ b/packages/app-cli/tests/MdToMd.ts
@@ -1,6 +1,6 @@
 const mdImporterService = require('@joplin/lib/services/interop/InteropService_Importer_Md').default;
 const Note = require('@joplin/lib/models/Note').default;
-const { setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js');
+const { setupDatabaseAndSynchronizer, switchClient } = require('@joplin/lib/testing/test-utils.js');

 const importer = new mdImporterService();

@@ -43,4 +43,9 @@ describe('InteropService_Importer_Md: importLocalImages', function() {
 		const items = await Note.linkedItems(note.body);
 		expect(items.length).toBe(1);
 	});
+	it('should import resources for files', async function() {
+		const note = await importer.importFile(`${__dirname}/md_to_md/sample-files.md`, 'notebook');
+		const items = await Note.linkedItems(note.body);
+		expect(items.length).toBe(4);
+	});
 });
--- a/packages/app-cli/tests/Synchronizer.sharing.ts
+++ b/packages/app-cli/tests/Synchronizer.sharing.ts
@@ -1,39 +0,0 @@
-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);
-	}));
-
-});
--- a/packages/app-cli/tests/database.js
+++ b/packages/app-cli/tests/database.js
@@ -1,31 +0,0 @@
-/* eslint-disable no-unused-vars */
-
-
-const time = require('@joplin/lib/time').default;
-const { sortedIds, createNTestNotes, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js');
-const Folder = require('@joplin/lib/models/Folder').default;
-const Note = require('@joplin/lib/models/Note').default;
-const Setting = require('@joplin/lib/models/Setting').default;
-const BaseModel = require('@joplin/lib/BaseModel').default;
-const ArrayUtils = require('@joplin/lib/ArrayUtils.js');
-const shim = require('@joplin/lib/shim').default;
-
-describe('database', function() {
-	beforeEach(async (done) => {
-		await setupDatabaseAndSynchronizer(1);
-		await switchClient(1);
-		done();
-	});
-
-	it('should not modify cached field names', (async () => {
-		const db = BaseModel.db();
-
-		const fieldNames = db.tableFieldNames('notes');
-		const fieldCount = fieldNames.length;
-		fieldNames.push('type_');
-
-		expect(fieldCount).toBeGreaterThan(0);
-		expect(db.tableFieldNames('notes').length).toBe(fieldCount);
-	}));
-
-});
--- a/packages/app-cli/tests/enex_to_md/code1.md
+++ b/packages/app-cli/tests/enex_to_md/code1.md
@@ -1,14 +1,16 @@
 For example, consider a web page like this:

-	<!DOCTYPE html>
-	<html>
-	  <head>
-	    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	  </head>
+```
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  </head>

-	  <body>
-	    <script src="page-scripts/page-script.js"></script>
-	  </body>
-	</html>
+  <body>
+    <script src="page-scripts/page-script.js"></script>
+  </body>
+</html>
+```

 The script "page-script.js" does this:
--- a/packages/app-cli/tests/enex_to_md/code2.md
+++ b/packages/app-cli/tests/enex_to_md/code2.md
@@ -1,7 +1,9 @@
 Subshell:

-	(
-	    set -e
-	    false
-	    echo Unreachable
-	) && echo Great success
+```
+(
+    set -e
+    false
+    echo Unreachable
+) && echo Great success
+```
--- a/packages/app-cli/tests/enex_to_md/code3.md
+++ b/packages/app-cli/tests/enex_to_md/code3.md
@@ -1 +1 @@
-	jq -r '.[]|[.index, .name, .section, .award, .industry]|join("\t")' raw.json |pbcopy
+`jq -r '.[]|[.index, .name, .section, .award, .industry]|join("\t")' raw.json |pbcopy`
--- a/packages/app-cli/tests/enex_to_md/code4.html
+++ b/packages/app-cli/tests/enex_to_md/code4.html
@@ -0,0 +1 @@
+<div><div>code block:</div><div><br/></div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, 'Courier New', monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>public static void main(String[] args) {</div><div><span>&nbsp; &nbsp; System.out.println('Hello World');</span><br/></div><div>}</div></div><div><br/></div><div>end of code block</div></div>
--- a/packages/app-cli/tests/enex_to_md/code4.md
+++ b/packages/app-cli/tests/enex_to_md/code4.md
@@ -0,0 +1,9 @@
+code block:
+
+```
+public static void main(String[] args) {
+    System.out.println('Hello World');
+}
+```
+
+end of code block
--- a/packages/app-cli/tests/feature_NoteHistory.js
+++ b/packages/app-cli/tests/feature_NoteHistory.js
@@ -1,4 +1,4 @@
-const { id, ids, createNTestFolders, sortedIds, createNTestNotes, TestApp } = require('./test-utils.js');
+const { id, ids, createNTestFolders, sortedIds, createNTestNotes, TestApp } = require('@joplin/lib/testing/test-utils.js');
 const BaseModel = require('@joplin/lib/BaseModel').default;
 const uuid = require('@joplin/lib/uuid').default;
 const Note = require('@joplin/lib/models/Note').default;
--- a/packages/app-cli/tests/feature_NoteList.js
+++ b/packages/app-cli/tests/feature_NoteList.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
-const { setupDatabaseAndSynchronizer, switchClient, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('./test-utils.js');
+const { setupDatabaseAndSynchronizer, switchClient, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('@joplin/lib/testing/test-utils.js');
 const Setting = require('@joplin/lib/models/Setting').default;
 const Folder = require('@joplin/lib/models/Folder').default;
 const Note = require('@joplin/lib/models/Note').default;
--- a/packages/app-cli/tests/feature_ShowAllNotes.js
+++ b/packages/app-cli/tests/feature_ShowAllNotes.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
-const { setupDatabaseAndSynchronizer, switchClient, id, ids, sortedIds, at, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('./test-utils.js');
+const { setupDatabaseAndSynchronizer, switchClient, id, ids, sortedIds, at, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('@joplin/lib/testing/test-utils.js');
 const Setting = require('@joplin/lib/models/Setting').default;
 const Folder = require('@joplin/lib/models/Folder').default;
 const Note = require('@joplin/lib/models/Note').default;
--- a/packages/app-cli/tests/feature_TagList.js
+++ b/packages/app-cli/tests/feature_TagList.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
-const { setupDatabaseAndSynchronizer, switchClient, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('./test-utils.js');
+const { setupDatabaseAndSynchronizer, switchClient, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('@joplin/lib/testing/test-utils.js');
 const Setting = require('@joplin/lib/models/Setting').default;
 const Folder = require('@joplin/lib/models/Folder').default;
 const Note = require('@joplin/lib/models/Note').default;
--- a/packages/app-cli/tests/file_api_driver.js
+++ b/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
-
-// });
--- a/packages/app-cli/tests/md_to_md/sample-files.md
+++ b/packages/app-cli/tests/md_to_md/sample-files.md
@@ -0,0 +1,9 @@
+# Markdown file test
+
+![../support/photo.jpg](../support/photo.jpg)
+
+[welcome.pdf](../support/welcome.pdf)
+
+[sample.md](sample.md)
+
+[sample2.md](./sample.md)
--- a/packages/app-cli/tests/services/keychain/KeychainService.ts
+++ b/packages/app-cli/tests/services/keychain/KeychainService.ts
@@ -1,8 +1,7 @@
 import KeychainService from '@joplin/lib/services/keychain/KeychainService';
 import shim from '@joplin/lib/shim';
 import Setting from '@joplin/lib/models/Setting';
-
-const { db, setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js');
+import { db, setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';

 function describeIfCompatible(name: string, fn: any, elseFn: any) {
 	if (['win32', 'darwin'].includes(shim.platformName())) {
--- a/packages/app-cli/tests/services/plugins/PluginService.ts
+++ b/packages/app-cli/tests/services/plugins/PluginService.ts
@@ -1,4 +1,4 @@
-import PluginRunner from '../app/services/plugins/PluginRunner';
+import PluginRunner from '../../../app/services/plugins/PluginRunner';
 import PluginService from '@joplin/lib/services/plugins/PluginService';
 import { ContentScriptType } from '@joplin/lib/services/plugins/api/types';
 import MdToHtml from '@joplin/renderer/MdToHtml';
@@ -7,10 +7,10 @@ import Setting from '@joplin/lib/models/Setting';
 import * as fs from 'fs-extra';
 import Note from '@joplin/lib/models/Note';
 import Folder from '@joplin/lib/models/Folder';
-import { newPluginScript } from './test-utils';
-import { expectNotThrow, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir } from './test-utils.js';
+import { expectNotThrow, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir, supportDir } from '@joplin/lib/testing/test-utils';
+import { newPluginScript } from '../../testUtils';

-const testPluginDir = `${__dirname}/../tests/support/plugins`;
+const testPluginDir = `${supportDir}/plugins`;

 function newPluginService(appVersion: string = '1.4') {
 	const runner = new PluginRunner();
@@ -102,7 +102,7 @@ describe('services_PluginService', function() {
 				"homepage_url": "https://joplinapp.org"
 			}
 			*/
-			
+
 			joplin.plugins.register({
 				onStart: async function() {
 					await joplin.data.post(['folders'], null, { title: "my plugin folder" });
@@ -141,14 +141,14 @@ describe('services_PluginService', function() {
 					"not_a_valid_manifest_at_all": 1
 				}
 				*/
-				
+
 				joplin.plugins.register({
 					onStart: async function() {},
 				});
 			`, `
 				/* joplin-manifest:
 				*/
-				
+
 				joplin.plugins.register({
 					onStart: async function() {},
 				});
@@ -189,7 +189,7 @@ describe('services_PluginService', function() {
 				"homepage_url": "https://joplinapp.org"
 			}
 			*/
-			
+
 			joplin.plugins.register({
 				onStart: async function() {
 					await joplin.contentScripts.register('markdownItPlugin', 'justtesting', './markdownItTestPlugin.js');
@@ -236,7 +236,7 @@ describe('services_PluginService', function() {
 				"version": "1.0.0"
 			}
 			*/
-			
+
 			joplin.plugins.register({
 				onStart: async function() { },
 			});
@@ -283,7 +283,7 @@ describe('services_PluginService', function() {
 	}));

 	it('should create the data directory', (async () => {
-		const pluginScript = newPluginScript(`			
+		const pluginScript = newPluginScript(`
 			joplin.plugins.register({
 				onStart: async function() {
 					const dataDir = await joplin.plugins.dataDir();
--- a/packages/app-cli/tests/services/plugins/RepositoryApi.ts
+++ b/packages/app-cli/tests/services/plugins/RepositoryApi.ts
@@ -1,6 +1,6 @@
 import RepositoryApi from '@joplin/lib/services/plugins/RepositoryApi';
 import shim from '@joplin/lib/shim';
-import { setupDatabaseAndSynchronizer, switchClient, supportDir, createTempDir } from '../../test-utils';
+import { setupDatabaseAndSynchronizer, switchClient, supportDir, createTempDir } from '@joplin/lib/testing/test-utils';

 async function newRepoApi(): Promise<RepositoryApi> {
 	const repo = new RepositoryApi(`${supportDir}/pluginRepo`, await createTempDir());
--- a/packages/app-cli/tests/services/plugins/api/JoplinSettings.ts
+++ b/packages/app-cli/tests/services/plugins/api/JoplinSettings.ts
@@ -1,7 +1,7 @@
 import Setting from '@joplin/lib/models/Setting';
-import PluginService from '@joplin/lib/services/plugins/PluginService';
-const { waitForFolderCount, newPluginService, newPluginScript, setupDatabaseAndSynchronizer, switchClient, afterEachCleanUp } = require('../../../test-utils');
+import { waitForFolderCount, setupDatabaseAndSynchronizer, switchClient, afterEachCleanUp } from '@joplin/lib/testing/test-utils';
 import Folder from '@joplin/lib/models/Folder';
+import { newPluginScript, newPluginService } from '../../../testUtils';

 describe('JoplinSettings', () => {

@@ -16,7 +16,7 @@ describe('JoplinSettings', () => {
 	});

 	test('should listen to setting change event', async () => {
-		const service = new newPluginService() as PluginService;
+		const service = newPluginService();

 		const pluginScript = newPluginScript(`
 			joplin.plugins.register({
@@ -68,7 +68,7 @@ describe('JoplinSettings', () => {
 	});

 	test('should allow registering multiple settings', async () => {
-		const service = new newPluginService() as PluginService;
+		const service = newPluginService();

 		const pluginScript = newPluginScript(`
 			joplin.plugins.register({
--- a/packages/app-cli/tests/services/plugins/api/JoplinViewMenuItem.ts
+++ b/packages/app-cli/tests/services/plugins/api/JoplinViewMenuItem.ts
@@ -1,6 +1,6 @@
 import KeymapService from '@joplin/lib/services/KeymapService';
-import PluginService from '@joplin/lib/services/plugins/PluginService';
-const { newPluginService, newPluginScript, setupDatabaseAndSynchronizer, switchClient, afterEachCleanUp } = require('../../../test-utils');
+import { setupDatabaseAndSynchronizer, switchClient, afterEachCleanUp } from '@joplin/lib/testing/test-utils';
+import { newPluginScript, newPluginService } from '../../../testUtils';

 describe('JoplinViewMenuItem', () => {

@@ -15,7 +15,7 @@ describe('JoplinViewMenuItem', () => {
 	});

 	test('should register commands with the keymap service', async () => {
-		const service = new newPluginService() as PluginService;
+		const service = newPluginService();

 		KeymapService.instance().initialize();

--- a/packages/app-cli/tests/services/plugins/api/JoplinWorkspace.ts
+++ b/packages/app-cli/tests/services/plugins/api/JoplinWorkspace.ts
@@ -1,8 +1,9 @@
 import Setting from '@joplin/lib/models/Setting';
-import { newPluginService, newPluginScript, setupDatabaseAndSynchronizer, switchClient, afterEachCleanUp } from '../../../test-utils';
+import { setupDatabaseAndSynchronizer, switchClient, afterEachCleanUp } from '@joplin/lib/testing/test-utils';
 import Note from '@joplin/lib/models/Note';
 import Folder from '@joplin/lib/models/Folder';
 import ItemChange from '@joplin/lib/models/ItemChange';
+import { newPluginScript, newPluginService } from '../../../testUtils';

 describe('JoplinWorkspace', () => {

--- a/packages/app-cli/tests/services/plugins/sandboxProxy.ts
+++ b/packages/app-cli/tests/services/plugins/sandboxProxy.ts
@@ -1,6 +1,5 @@
 import sandboxProxy, { Target } from '@joplin/lib/services/plugins/sandboxProxy';
-
-const { setupDatabaseAndSynchronizer, switchClient } = require('../../test-utils.js');
+import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';

 describe('services_plugins_sandboxProxy', function() {

--- a/packages/app-cli/tests/support/createSyncTargetSnapshot.js
+++ b/packages/app-cli/tests/support/createSyncTargetSnapshot.js
@@ -1,4 +1,4 @@
-const {main} = require('./syncTargetUtils');
+const {main} = require('@joplin/lib/testing/syncTargetUtils');

 const syncTargetType = process.argv.length <= 2 ? 'normal' : process.argv[2];

--- a/packages/app-cli/tests/support/plugins/selected_text/api/JoplinInterop.d.ts
+++ b/packages/app-cli/tests/support/plugins/selected_text/api/JoplinInterop.d.ts
@@ -1,17 +0,0 @@
-import { ExportModule, ImportModule } from './types';
-/**
- * Provides a way to create modules to import external data into Joplin or to export notes into any arbitrary format.
- *
- * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/json_export)
- *
- * To implement an import or export module, you would simply define an object with various event handlers that are called
- * by the application during the import/export process.
- *
- * See the documentation of the [[ExportModule]] and [[ImportModule]] for more information.
- *
- * You may also want to refer to the Joplin API documentation to see the list of properties for each item (note, notebook, etc.) - https://joplinapp.org/api/references/rest_api/
- */
-export default class JoplinInterop {
-    registerExportModule(module: ExportModule): Promise<void>;
-    registerImportModule(module: ImportModule): Promise<void>;
-}
--- a/packages/app-cli/tests/testUtils.ts
+++ b/packages/app-cli/tests/testUtils.ts
@@ -0,0 +1,41 @@
+import PluginService from '@joplin/lib/services/plugins/PluginService';
+import PluginRunner from '../app/services/plugins/PluginRunner';
+
+export interface PluginServiceOptions {
+	getState?(): Record<string, any>;
+}
+
+export function newPluginService(appVersion = '1.4', options: PluginServiceOptions = null): PluginService {
+	options = options || {};
+
+	const runner = new PluginRunner();
+	const service = new PluginService();
+	service.initialize(
+		appVersion,
+		{
+			joplin: {},
+		},
+		runner,
+		{
+			dispatch: () => {},
+			getState: options.getState ? options.getState : () => {},
+		}
+	);
+	return service;
+}
+
+export function newPluginScript(script: string) {
+	return `
+		/* joplin-manifest:
+		{
+			"id": "org.joplinapp.plugins.PluginTest",
+			"manifest_version": 1,
+			"app_min_version": "1.4",
+			"name": "JS Bundle test",
+			"version": "1.0.0"
+		}
+		*/
+		
+		${script}
+	`;
+}
--- a/packages/app-clipper/manifest.json
+++ b/packages/app-clipper/manifest.json
@@ -1,7 +1,7 @@
 {
    "manifest_version": 2,
    "name": "Joplin Web Clipper [DEV]",
-    "version": "1.8.0",
+    "version": "2.0.0",
    "description": "Capture and save web pages and screenshots from your browser to Joplin.",
    "homepage_url": "https://joplinapp.org",
    "content_security_policy": "script-src 'self'; object-src 'self'",
--- a/packages/app-desktop/.gitignore
+++ b/packages/app-desktop/.gitignore
@@ -7,4 +7,5 @@ gui/note-viewer/pluginAssets/
 pluginAssets/
 gui/note-viewer/fonts/
 gui/note-viewer/lib.js
-gui/NoteEditor/NoteBody/TinyMCE/supportedLocales.js
+gui/NoteEditor/NoteBody/TinyMCE/supportedLocales.js
+runForSharingCommands-*
--- a/packages/app-desktop/InteropServiceHelper.ts
+++ b/packages/app-desktop/InteropServiceHelper.ts
@@ -166,6 +166,7 @@ export default class InteropServiceHelper {
 		exportOptions.format = module.format;
 		// exportOptions.modulePath = module.path;
 		if (options.plugins) exportOptions.plugins = options.plugins;
+		exportOptions.customCss = options.customCss;
 		exportOptions.target = module.target;
 		exportOptions.includeConflicts = !!options.includeConflicts;
 		if (options.sourceFolderIds) exportOptions.sourceFolderIds = options.sourceFolderIds;
--- a/packages/app-desktop/app.ts
+++ b/packages/app-desktop/app.ts
@@ -13,6 +13,7 @@ import Logger, { TargetType } from '@joplin/lib/Logger';
 import Setting from '@joplin/lib/models/Setting';
 import actionApi from '@joplin/lib/services/rest/actionApi.desktop';
 import BaseApplication from '@joplin/lib/BaseApplication';
+import DebugService from '@joplin/lib/debug/DebugService';
 import { _, setLocale } from '@joplin/lib/locale';
 import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerService';
 import SpellCheckerServiceDriverNative from './services/spellChecker/SpellCheckerServiceDriverNative';
@@ -58,6 +59,7 @@ const commands = [
 	require('./gui/MainScreen/commands/openTag'),
 	require('./gui/MainScreen/commands/print'),
 	require('./gui/MainScreen/commands/renameFolder'),
+	require('./gui/MainScreen/commands/showShareFolderDialog'),
 	require('./gui/MainScreen/commands/renameTag'),
 	require('./gui/MainScreen/commands/search'),
 	require('./gui/MainScreen/commands/selectTemplate'),
@@ -100,6 +102,8 @@ const globalCommands = [
 ];

 import editorCommandDeclarations from './gui/NoteEditor/commands/editorCommandDeclarations';
+import ShareService from '@joplin/lib/services/share/ShareService';
+import checkForUpdates from './checkForUpdates';

 const pluginClasses = [
 	require('./plugins/GotoAnything').default,
@@ -164,10 +168,6 @@ class Application extends BaseApplication {
 		return true;
 	}

-	checkForUpdateLoggerPath() {
-		return `${Setting.value('profileDir')}/log-autoupdater.txt`;
-	}
-
 	reducer(state: AppState = appDefaultState, action: any) {
 		let newState = state;

@@ -708,7 +708,7 @@ class Application extends BaseApplication {
 		if (shim.isWindows() || shim.isMac()) {
 			const runAutoUpdateCheck = () => {
 				if (Setting.value('autoUpdateEnabled')) {
-					bridge().checkForUpdates(true, bridge().window(), this.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
+					void checkForUpdates(true, bridge().window(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
 				}
 			};

@@ -730,6 +730,8 @@ class Application extends BaseApplication {
 			bridge().window().show();
 		}

+		void ShareService.instance().maintenance();
+
 		ResourceService.runInBackground();

 		if (Setting.value('env') === 'dev') {
@@ -764,15 +766,16 @@ class Application extends BaseApplication {
 		RevisionService.instance().runInBackground();

 		// Make it available to the console window - useful to call revisionService.collectRevisions()
-		(window as any).joplin = () => {
-			return {
+		if (Setting.value('env') === 'dev') {
+			(window as any).joplin = {
 				revisionService: RevisionService.instance(),
 				migrationService: MigrationService.instance(),
 				decryptionWorker: DecryptionWorker.instance(),
 				commandService: CommandService.instance(),
 				bridge: bridge(),
+				debug: new DebugService(reg.db()),
 			};
-		};
+		}

 		bridge().addEventListener('nativeThemeUpdated', this.bridge_nativeThemeUpdated);

--- a/packages/app-desktop/bridge.ts
+++ b/packages/app-desktop/bridge.ts
@@ -1,6 +1,5 @@
 import ElectronAppWrapper from './ElectronAppWrapper';
 import shim from '@joplin/lib/shim';
-
 import { _, setLocale } from '@joplin/lib/locale';
 const { dirname, toSystemSlashes } = require('@joplin/lib/path-utils');
 const { BrowserWindow, nativeTheme } = require('electron');
@@ -174,11 +173,6 @@ export class Bridge {
 		return require('electron').shell.openPath(fullPath);
 	}

-	checkForUpdates(inBackground: boolean, window: any, logFilePath: string, options: any) {
-		const { checkForUpdates } = require('./checkForUpdates.js');
-		checkForUpdates(inBackground, window, logFilePath, options);
-	}
-
 	buildDir() {
 		return this.electronApp().buildDir();
 	}
--- a/packages/app-desktop/checkForUpdates.ts
+++ b/packages/app-desktop/checkForUpdates.ts
@@ -1,44 +1,42 @@
-const { dialog } = require('electron');
-const shim = require('@joplin/lib/shim').default;
-const Logger = require('@joplin/lib/Logger').default;
-const { _ } = require('@joplin/lib/locale');
-const fetch = require('node-fetch');
+import shim from '@joplin/lib/shim';
+import Logger from '@joplin/lib/Logger';
+import { _ } from '@joplin/lib/locale';
+import bridge from './services/bridge';
+import KvStore from '@joplin/lib/services/KvStore';
 const { fileExtension } = require('@joplin/lib/path-utils');
+const ArrayUtils = require('@joplin/lib/ArrayUtils');
 const packageInfo = require('./packageInfo.js');
 const compareVersions = require('compare-versions');

-let autoUpdateLogger_ = new Logger();
+const logger = Logger.create('checkForUpdates');
+
 let checkInBackground_ = false;
 let isCheckingForUpdate_ = false;
-let parentWindow_ = null;

-function showErrorMessageBox(message) {
-	return dialog.showMessageBox(parentWindow_, {
-		type: 'error',
-		message: message,
-	});
+interface CheckForUpdateOptions {
+	includePreReleases?: boolean;
 }

 function onCheckStarted() {
-	autoUpdateLogger_.info('checkForUpdates: Starting...');
+	logger.info('Starting...');
 	isCheckingForUpdate_ = true;
 }

 function onCheckEnded() {
-	autoUpdateLogger_.info('checkForUpdates: Done.');
+	logger.info('Done.');
 	isCheckingForUpdate_ = false;
 }

-function getMajorMinorTagName(tagName) {
+function getMajorMinorTagName(tagName: string) {
 	const s = tagName.split('.');
 	s.pop();
 	return s.join('.');
 }

-async function fetchLatestRelease(options) {
+async function fetchLatestRelease(options: CheckForUpdateOptions) {
 	options = Object.assign({}, { includePreReleases: false }, options);

-	const response = await fetch('https://api.github.com/repos/laurent22/joplin/releases');
+	const response = await shim.fetch('https://api.github.com/repos/laurent22/joplin/releases');

 	if (!response.ok) {
 		const responseText = await response.text();
@@ -104,7 +102,7 @@ async function fetchLatestRelease(options) {
 		}
 	}

-	function cleanUpReleaseNotes(releaseNotes) {
+	function cleanUpReleaseNotes(releaseNotes: string[]) {
 		const lines = releaseNotes.join('\n\n* * *\n\n').split('\n');
 		const output = [];
 		for (const line of lines) {
@@ -129,7 +127,7 @@ async function fetchLatestRelease(options) {
 	};
 }

-function truncateText(text, length) {
+function truncateText(text: string, length: number) {
 	let truncated = text.substring(0, length);
 	const lastNewLine = truncated.lastIndexOf('\n');
 	// Cut off at a line break unless we'd be cutting off half the text
@@ -141,66 +139,80 @@ function truncateText(text, length) {
 	return truncated;
 }

-function checkForUpdates(inBackground, window, logFilePath, options) {
+async function getSkippedVersions(): Promise<string[]> {
+	const r = await KvStore.instance().value<string>('updateCheck::skippedVersions');
+	return r ? JSON.parse(r) : [];
+}
+
+async function isSkippedVersion(v: string): Promise<boolean> {
+	const versions = await getSkippedVersions();
+	return versions.includes(v);
+}
+
+async function addSkippedVersion(s: string) {
+	let versions = await getSkippedVersions();
+	versions.push(s);
+	versions = ArrayUtils.unique(versions);
+	await KvStore.instance().setValue('updateCheck::skippedVersions', JSON.stringify(versions));
+}
+
+export default async function checkForUpdates(inBackground: boolean, parentWindow: any, options: CheckForUpdateOptions) {
 	if (isCheckingForUpdate_) {
-		autoUpdateLogger_.info('checkForUpdates: Skipping check because it is already running');
+		logger.info('Skipping check because it is already running');
 		return;
 	}

-	parentWindow_ = window;
-
 	onCheckStarted();

-	if (logFilePath && !autoUpdateLogger_.targets().length) {
-		autoUpdateLogger_ = new Logger();
-		autoUpdateLogger_.addTarget('file', { path: logFilePath });
-		autoUpdateLogger_.setLevel(Logger.LEVEL_DEBUG);
-		autoUpdateLogger_.info('checkForUpdates: Initializing...');
-	}
-
 	checkInBackground_ = inBackground;

-	autoUpdateLogger_.info(`checkForUpdates: Checking with options ${JSON.stringify(options)}`);
+	logger.info(`Checking with options ${JSON.stringify(options)}`);

-	fetchLatestRelease(options).then(async (release) => {
-		autoUpdateLogger_.info(`Current version: ${packageInfo.version}`);
-		autoUpdateLogger_.info(`Latest version: ${release.version}`);
-		autoUpdateLogger_.info('Is Pre-release:', release.prerelease);
+	try {
+		const release = await fetchLatestRelease(options);
+
+		logger.info(`Current version: ${packageInfo.version}`);
+		logger.info(`Latest version: ${release.version}`);
+		logger.info('Is Pre-release:', release.prerelease);

 		if (compareVersions(release.version, packageInfo.version) <= 0) {
 			if (!checkInBackground_) {
-				await dialog.showMessageBox({
-					type: 'info',
-					message: _('Current version is up-to-date.'),
-					buttons: [_('OK')],
-				});
+				await bridge().showMessageBox(_('Current version is up-to-date.'));
 			}
 		} else {
-			const fullReleaseNotes = release.notes.trim() ? `\n\n${release.notes.trim()}` : '';
-			const MAX_RELEASE_NOTES_LENGTH = 1000;
-			const truncateReleaseNotes = fullReleaseNotes.length > MAX_RELEASE_NOTES_LENGTH;
-			const releaseNotes = truncateReleaseNotes ? truncateText(fullReleaseNotes, MAX_RELEASE_NOTES_LENGTH) : fullReleaseNotes;
+			const shouldSkip = checkInBackground_ && await isSkippedVersion(release.version);

-			const newVersionString = release.prerelease ? _('%s (pre-release)', release.version) : release.version;
+			if (shouldSkip) {
+				logger.info('Not displaying notification because version has been skipped');
+			} else {
+				const fullReleaseNotes = release.notes.trim() ? `\n\n${release.notes.trim()}` : '';
+				const MAX_RELEASE_NOTES_LENGTH = 1000;
+				const truncateReleaseNotes = fullReleaseNotes.length > MAX_RELEASE_NOTES_LENGTH;
+				const releaseNotes = truncateReleaseNotes ? truncateText(fullReleaseNotes, MAX_RELEASE_NOTES_LENGTH) : fullReleaseNotes;

-			const result = await dialog.showMessageBox(parentWindow_, {
-				type: 'info',
-				message: `${_('An update is available, do you want to download it now?')}`,
-				detail: `${_('Your version: %s', packageInfo.version)}\n${_('New version: %s', newVersionString)}${releaseNotes}`,
-				buttons: [_('Download'), _('Cancel'), _('Full changelog')],
-				cancelId: 1,
-			});
+				const newVersionString = release.prerelease ? _('%s (pre-release)', release.version) : release.version;

-			const buttonIndex = result.response;
-			if (buttonIndex === 0) require('electron').shell.openExternal(release.downloadUrl ? release.downloadUrl : release.pageUrl);
-			if (buttonIndex === 2) require('electron').shell.openExternal('https://joplinapp.org/changelog/');
+				const buttonIndex = await bridge().showMessageBox(parentWindow, {
+					type: 'info',
+					message: `${_('An update is available, do you want to download it now?')}`,
+					detail: `${_('Your version: %s', packageInfo.version)}\n${_('New version: %s', newVersionString)}${releaseNotes}`,
+					buttons: [_('Download'), _('Skip this version'), _('Full changelog'), _('Cancel')],
+					cancelId: 3,
+				});
+
+				if (buttonIndex === 0) {
+					bridge().openExternal(release.downloadUrl ? release.downloadUrl : release.pageUrl);
+				} else if (buttonIndex === 1) {
+					await addSkippedVersion(release.version);
+				} else if (buttonIndex === 2) {
+					bridge().openExternal('https://joplinapp.org/changelog/');
+				}
+			}
 		}
-	}).catch(error => {
-		autoUpdateLogger_.error(error);
-		if (!checkInBackground_) showErrorMessageBox(error.message);
-	}).then(() => {
+	} catch (error) {
+		logger.error(error);
+		if (!checkInBackground_) await bridge().showErrorMessageBox(error.message);
+	} finally {
 		onCheckEnded();
-	});
+	}
 }
-
-module.exports.checkForUpdates = checkForUpdates;
--- a/packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx
+++ b/packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx
@@ -13,8 +13,13 @@ import { PluginItem } from './PluginBox';
 import RepositoryApi from '@joplin/lib/services/plugins/RepositoryApi';
 import Setting from '@joplin/lib/models/Setting';
 import useOnInstallHandler, { OnPluginSettingChangeEvent } from './useOnInstallHandler';
+import Logger from '@joplin/lib/Logger';
+import StyledMessage from '../../../style/StyledMessage';
+import StyledLink from '../../../style/StyledLink';
 const { space } = require('styled-system');

+const logger = Logger.create('PluginState');
+
 const maxWidth: number = 320;

 const Root = styled.div`
@@ -32,6 +37,11 @@ const ToolsButton = styled(Button)`
 	margin-right: 6px;
 `;

+const RepoApiErrorMessage = styled(StyledMessage)`
+	max-width: ${props => props.maxWidth}px;
+	margin-bottom: 10px;
+`;
+
 interface Props {
 	value: any;
 	themeId: number;
@@ -84,6 +94,8 @@ export default function(props: Props) {
 	const [manifestsLoaded, setManifestsLoaded] = useState<boolean>(false);
 	const [updatingPluginsIds, setUpdatingPluginIds] = useState<Record<string, boolean>>({});
 	const [canBeUpdatedPluginIds, setCanBeUpdatedPluginIds] = useState<Record<string, boolean>>({});
+	const [repoApiError, setRepoApiError] = useState<Error>(null);
+	const [fetchManifestTime, setFetchManifestTime] = useState<number>(Date.now());

 	const pluginService = PluginService.instance();

@@ -96,9 +108,25 @@ export default function(props: Props) {
 	useEffect(() => {
 		let cancelled = false;
 		async function fetchManifests() {
-			await repoApi().loadManifests();
+			setManifestsLoaded(false);
+			setRepoApiError(null);
+
+			let loadError: Error = null;
+			try {
+				await repoApi().loadManifests();
+			} catch (error) {
+				logger.error(error);
+				loadError = error;
+			}
+
 			if (cancelled) return;
-			setManifestsLoaded(true);
+
+			if (loadError) {
+				setManifestsLoaded(false);
+				setRepoApiError(loadError);
+			} else {
+				setManifestsLoaded(true);
+			}
 		}

 		void fetchManifests();
@@ -106,7 +134,7 @@ export default function(props: Props) {
 		return () => {
 			cancelled = true;
 		};
-	}, []);
+	}, [fetchManifestTime]);

 	useEffect(() => {
 		if (!manifestsLoaded) return () => {};
@@ -252,7 +280,7 @@ export default function(props: Props) {

 	function renderSearchArea() {
 		return (
-			<div style={{ marginBottom: 20 }}>
+			<div style={{ marginBottom: 0 }}>
 				<SearchPlugins
 					disabled={!manifestsLoaded}
 					maxWidth={maxWidth}
@@ -268,11 +296,18 @@ export default function(props: Props) {
 		);
 	}

+	function renderRepoApiError() {
+		if (!repoApiError) return null;
+
+		return <RepoApiErrorMessage maxWidth={maxWidth} type="error">{_('Could not connect to plugin repository')} - <StyledLink href="#" onClick={() => { setFetchManifestTime(Date.now()); }}>{_('Try again')}</StyledLink></RepoApiErrorMessage>;
+	}
+
 	function renderBottomArea() {
 		if (searchQuery) return null;

 		return (
 			<div>
+				{renderRepoApiError()}
 				<div style={{ display: 'flex', flexDirection: 'row', maxWidth }}>
 					<ToolsButton tooltip={_('Plugin tools')} iconName="fas fa-cog" level={ButtonLevel.Secondary} onClick={onToolsClick}/>
 					<div style={{ display: 'flex', flex: 1 }}>
--- a/packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.tsx
+++ b/packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.tsx
@@ -101,7 +101,7 @@ export default function(props: Props) {
 					onChange={onChange}
 					onSearchButtonClick={onSearchButtonClick}
 					searchStarted={searchStarted}
-					placeholder={_('Search for plugins...')}
+					placeholder={props.disabled ? _('Please wait...') : _('Search for plugins...')}
 					disabled={props.disabled}
 				/>
 			</div>
--- a/packages/app-desktop/gui/Dialog.tsx
+++ b/packages/app-desktop/gui/Dialog.tsx
@@ -0,0 +1,40 @@
+import styled from 'styled-components';
+
+const DialogModalLayer = styled.div`
+	z-index: 9999;
+	display: flex;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0,0,0,0.6);
+	align-items: flex-start;
+	justify-content: center;
+	overflow: hidden;
+`;
+
+const DialogRoot = styled.div`
+	background-color: ${props => props.theme.backgroundColor};
+	padding: 16px;
+	box-shadow: 6px 6px 20px rgba(0,0,0,0.5);
+	margin-top: 20px;
+	min-height: fit-content;
+	display: flex;
+	flex-direction: column;
+	width: 50%;
+`;
+
+interface Props {
+	renderContent: Function;
+}
+
+export default function Dialog(props: Props) {
+	return (
+		<DialogModalLayer>
+			<DialogRoot>
+				{props.renderContent()}
+			</DialogRoot>
+		</DialogModalLayer>
+	);
+}
--- a/packages/app-desktop/gui/DialogButtonRow.tsx
+++ b/packages/app-desktop/gui/DialogButtonRow.tsx
@@ -2,7 +2,26 @@ const React = require('react');
 const { _ } = require('@joplin/lib/locale');
 const { themeStyle } = require('@joplin/lib/theme');

-function DialogButtonRow(props) {
+export interface ButtonSpec {
+	name: string;
+	label: string;
+}
+
+export interface ClickEvent {
+	buttonName: string;
+}
+
+interface Props {
+	themeId: number;
+	onClick?: (event: ClickEvent)=> void;
+	okButtonShow?: boolean;
+	cancelButtonShow?: boolean;
+	cancelButtonLabel?: string;
+	okButtonRef?: any;
+	customButtons?: ButtonSpec[];
+}
+
+export default function DialogButtonRow(props: Props) {
 	const theme = themeStyle(props.themeId);

 	const okButton_click = () => {
@@ -13,7 +32,11 @@ function DialogButtonRow(props) {
 		if (props.onClick) props.onClick({ buttonName: 'cancel' });
 	};

-	const onKeyDown = (event) => {
+	const customButton_click = (event: ClickEvent) => {
+		if (props.onClick) props.onClick(event);
+	};
+
+	const onKeyDown = (event: any) => {
 		if (event.keyCode === 13) {
 			okButton_click();
 		} else if (event.keyCode === 27) {
@@ -23,6 +46,16 @@ function DialogButtonRow(props) {

 	const buttonComps = [];

+	if (props.customButtons) {
+		for (const b of props.customButtons) {
+			buttonComps.push(
+				<button key={b.name} style={theme.buttonStyle} onClick={() => customButton_click({ buttonName: b.name })} onKeyDown={onKeyDown}>
+					{b.label}
+				</button>
+			);
+		}
+	}
+
 	if (props.okButtonShow !== false) {
 		buttonComps.push(
 			<button key="ok" style={theme.buttonStyle} onClick={okButton_click} ref={props.okButtonRef} onKeyDown={onKeyDown}>
@@ -41,5 +74,3 @@ function DialogButtonRow(props) {

 	return <div style={{ textAlign: 'right', marginTop: 10 }}>{buttonComps}</div>;
 }
-
-module.exports = DialogButtonRow;
--- a/packages/app-desktop/gui/DialogTitle.tsx
+++ b/packages/app-desktop/gui/DialogTitle.tsx
@@ -0,0 +1,21 @@
+import styled from 'styled-components';
+
+const Root = styled.div`
+	font-family: ${props => props.theme.fontFamily};
+	font-size: ${props => props.theme.fontSize * 1.5};
+	line-height: 1.6em;
+	color: ${props => props.theme.color};
+	font-weight: bold;
+	margin-bottom: 1.2em;
+`;
+
+
+interface Props {
+	title: string;
+}
+
+export default function DialogTitle(props: Props) {
+	return (
+		<Root>{props.title}</Root>
+	);
+}
--- a/packages/app-desktop/gui/EncryptionConfigScreen.jsx
+++ b/packages/app-desktop/gui/EncryptionConfigScreen.jsx
@@ -256,7 +256,7 @@ class EncryptionConfigScreenComponent extends React.Component {
 			<div>
 				<div style={containerStyle}>
 					{
-						<div style={{ backgroundColor: theme.warningBackgroundColor, paddingLeft: 10, paddingRight: 10, paddingTop: 2, paddingBottom: 2 }}>
+						<div className="alert alert-warning" style={{ backgroundColor: theme.warningBackgroundColor, paddingLeft: 10, paddingRight: 10, paddingTop: 2, paddingBottom: 2 }}>
 							<p style={theme.textStyle}>
 								<span>{_('For more information about End-To-End Encryption (E2EE) and advice on how to enable it please check the documentation:')}</span>{' '}
 								<a
--- a/packages/app-desktop/gui/MainScreen/MainScreen.tsx
+++ b/packages/app-desktop/gui/MainScreen/MainScreen.tsx
@@ -29,12 +29,17 @@ import { themeStyle } from '@joplin/lib/theme';
 import validateLayout from '../ResizableLayout/utils/validateLayout';
 import iterateItems from '../ResizableLayout/utils/iterateItems';
 import removeItem from '../ResizableLayout/utils/removeItem';
+import EncryptionService from '@joplin/lib/services/EncryptionService';
+import ShareFolderDialog from '../ShareFolderDialog/ShareFolderDialog';
+import { ShareInvitation } from '@joplin/lib/services/share/reducer';
+import ShareService from '@joplin/lib/services/share/ShareService';
+import { reg } from '@joplin/lib/registry';
+import removeKeylessItems from '../ResizableLayout/utils/removeKeylessItems';

 const { connect } = require('react-redux');
 const { PromptDialog } = require('../PromptDialog.min.js');
 const NotePropertiesDialog = require('../NotePropertiesDialog.min.js');
 const PluginManager = require('@joplin/lib/services/PluginManager');
-import EncryptionService from '@joplin/lib/services/EncryptionService';
 const ipcRenderer = require('electron').ipcRenderer;

 interface LayerModalState {
@@ -63,15 +68,22 @@ interface Props {
 	settingEditorCodeView: boolean;
 	pluginsLegacy: any;
 	startupPluginsLoaded: boolean;
+	shareInvitations: ShareInvitation[];
 	isSafeMode: boolean;
 }

+interface ShareFolderDialogOptions {
+	folderId: string;
+	visible: boolean;
+}
+
 interface State {
 	promptOptions: any;
 	modalLayer: LayerModalState;
 	notePropertiesDialogOptions: any;
 	noteContentPropertiesDialogOptions: any;
 	shareNoteDialogOptions: any;
+	shareFolderDialogOptions: ShareFolderDialogOptions;
 }

 const StyledUserWebviewDialogContainer = styled.div`
@@ -105,6 +117,7 @@ const commands = [
 	require('./commands/newTodo'),
 	require('./commands/print'),
 	require('./commands/renameFolder'),
+	require('./commands/showShareFolderDialog'),
 	require('./commands/renameTag'),
 	require('./commands/search'),
 	require('./commands/selectTemplate'),
@@ -144,6 +157,10 @@ class MainScreenComponent extends React.Component<Props, State> {
 			notePropertiesDialogOptions: {},
 			noteContentPropertiesDialogOptions: {},
 			shareNoteDialogOptions: {},
+			shareFolderDialogOptions: {
+				visible: false,
+				folderId: '',
+			},
 		};

 		this.updateMainLayout(this.buildLayout(props.plugins));
@@ -155,6 +172,7 @@ class MainScreenComponent extends React.Component<Props, State> {
 		this.notePropertiesDialog_close = this.notePropertiesDialog_close.bind(this);
 		this.noteContentPropertiesDialog_close = this.noteContentPropertiesDialog_close.bind(this);
 		this.shareNoteDialog_close = this.shareNoteDialog_close.bind(this);
+		this.shareFolderDialog_close = this.shareFolderDialog_close.bind(this);
 		this.resizableLayout_resize = this.resizableLayout_resize.bind(this);
 		this.resizableLayout_renderItem = this.resizableLayout_renderItem.bind(this);
 		this.resizableLayout_moveButtonClick = this.resizableLayout_moveButtonClick.bind(this);
@@ -204,6 +222,10 @@ class MainScreenComponent extends React.Component<Props, State> {
 		return newLayout !== layout ? validateLayout(newLayout) : layout;
 	}

+	private showShareInvitationNotification(props: Props): boolean {
+		return !!props.shareInvitations.find(i => i.status === 0);
+	}
+
 	private buildLayout(plugins: PluginStates): LayoutItem {
 		const rootLayoutSize = this.rootLayoutSize();

@@ -213,6 +235,14 @@ class MainScreenComponent extends React.Component<Props, State> {
 		try {
 			output = loadLayout(Object.keys(userLayout).length ? userLayout : null, defaultLayout, rootLayoutSize);

+			// For unclear reasons, layout items sometimes end up witout a key.
+			// In that case, we can't do anything with them, so remove them
+			// here. It could be due to the deprecated plugin API, which allowed
+			// creating panel without a key, although in this case it should
+			// have been set automatically.
+			// https://github.com/laurent22/joplin/issues/4926
+			output = removeKeylessItems(output);
+
 			if (!findItemByKey(output, 'sideBar') || !findItemByKey(output, 'noteList') || !findItemByKey(output, 'editor')) {
 				throw new Error('"sideBar", "noteList" and "editor" must be present in the layout');
 			}
@@ -268,10 +298,14 @@ class MainScreenComponent extends React.Component<Props, State> {
 		this.setState({ noteContentPropertiesDialogOptions: {} });
 	}

-	shareNoteDialog_close() {
+	private shareNoteDialog_close() {
 		this.setState({ shareNoteDialogOptions: {} });
 	}

+	private shareFolderDialog_close() {
+		this.setState({ shareFolderDialogOptions: { visible: false, folderId: '' } });
+	}
+
 	updateMainLayout(layout: LayoutItem) {
 		this.props.dispatch({
 			type: 'MAIN_LAYOUT_SET',
@@ -321,6 +355,13 @@ class MainScreenComponent extends React.Component<Props, State> {
 			});
 		}

+		if (this.state.shareFolderDialogOptions !== prevState.shareFolderDialogOptions) {
+			this.props.dispatch({
+				type: this.state.shareFolderDialogOptions && this.state.shareFolderDialogOptions.visible ? 'VISIBLE_DIALOGS_ADD' : 'VISIBLE_DIALOGS_REMOVE',
+				name: 'shareFolder',
+			});
+		}
+
 		if (this.props.mainLayout !== prevProps.mainLayout) {
 			const toSave = saveLayout(this.props.mainLayout);
 			Setting.setValue('ui.layout', toSave);
@@ -496,6 +537,12 @@ class MainScreenComponent extends React.Component<Props, State> {
 			bridge().restart();
 		};

+		const onInvitationRespond = async (shareUserId: string, accept: boolean) => {
+			await ShareService.instance().respondInvitation(shareUserId, accept);
+			await ShareService.instance().refreshShareInvitations();
+			void reg.scheduleSync(1000);
+		};
+
 		let msg = null;

 		if (this.props.isSafeMode) {
@@ -516,15 +563,6 @@ class MainScreenComponent extends React.Component<Props, State> {
 					</a>
 				</span>
 			);
-		} else if (this.props.hasDisabledSyncItems) {
-			msg = (
-				<span>
-					{_('Some items cannot be synchronised.')}{' '}
-					<a href="#" onClick={() => onViewStatusScreen()}>
-						{_('View them now')}
-					</a>
-				</span>
-			);
 		} else if (this.props.hasDisabledEncryptionItems) {
 			msg = (
 				<span>
@@ -534,15 +572,6 @@ class MainScreenComponent extends React.Component<Props, State> {
 					</a>
 				</span>
 			);
-		} else if (this.props.showMissingMasterKeyMessage) {
-			msg = (
-				<span>
-					{_('One or more master keys need a password.')}{' '}
-					<a href="#" onClick={() => onViewEncryptionConfigScreen()}>
-						{_('Set the password')}
-					</a>
-				</span>
-			);
 		} else if (this.props.showNeedUpgradingMasterKeyMessage) {
 			msg = (
 				<span>
@@ -561,6 +590,40 @@ class MainScreenComponent extends React.Component<Props, State> {
 					</a>
 				</span>
 			);
+		} else if (this.showShareInvitationNotification(this.props)) {
+			const invitation = this.props.shareInvitations[0];
+			const sharer = invitation.share.user;
+
+			msg = (
+				<span>
+					{_('%s (%s) would like to share a notebook with you.', sharer.full_name, sharer.email)}{' '}
+					<a href="#" onClick={() => onInvitationRespond(invitation.id, true)}>
+						{_('Accept')}
+					</a>
+					{' / '}
+					<a href="#" onClick={() => onInvitationRespond(invitation.id,true)}>
+						{_('Reject')}
+					</a>
+				</span>
+			);
+		} else if (this.props.hasDisabledSyncItems) {
+			msg = (
+				<span>
+					{_('Some items cannot be synchronised.')}{' '}
+					<a href="#" onClick={() => onViewStatusScreen()}>
+						{_('View them now')}
+					</a>
+				</span>
+			);
+		} else if (this.props.showMissingMasterKeyMessage) {
+			msg = (
+				<span>
+					{_('One or more master keys need a password.')}{' '}
+					<a href="#" onClick={() => onViewEncryptionConfigScreen()}>
+						{_('Set the password')}
+					</a>
+				</span>
+			);
 		}

 		return (
@@ -572,7 +635,7 @@ class MainScreenComponent extends React.Component<Props, State> {

 	messageBoxVisible(props: Props = null) {
 		if (!props) props = this.props;
-		return props.hasDisabledSyncItems || props.showMissingMasterKeyMessage || props.showNeedUpgradingMasterKeyMessage || props.showShouldReencryptMessage || props.hasDisabledEncryptionItems || this.props.shouldUpgradeSyncTarget || props.isSafeMode;
+		return props.hasDisabledSyncItems || props.showMissingMasterKeyMessage || props.showNeedUpgradingMasterKeyMessage || props.showShouldReencryptMessage || props.hasDisabledEncryptionItems || this.props.shouldUpgradeSyncTarget || props.isSafeMode || this.showShareInvitationNotification(props);
 	}

 	registerCommands() {
@@ -739,6 +802,7 @@ class MainScreenComponent extends React.Component<Props, State> {
 		const notePropertiesDialogOptions = this.state.notePropertiesDialogOptions;
 		const noteContentPropertiesDialogOptions = this.state.noteContentPropertiesDialogOptions;
 		const shareNoteDialogOptions = this.state.shareNoteDialogOptions;
+		const shareFolderDialogOptions = this.state.shareFolderDialogOptions;

 		const layoutComp = this.props.mainLayout ? (
 			<ResizableLayout
@@ -759,6 +823,7 @@ class MainScreenComponent extends React.Component<Props, State> {
 				{noteContentPropertiesDialogOptions.visible && <NoteContentPropertiesDialog markupLanguage={noteContentPropertiesDialogOptions.markupLanguage} themeId={this.props.themeId} onClose={this.noteContentPropertiesDialog_close} text={noteContentPropertiesDialogOptions.text}/>}
 				{notePropertiesDialogOptions.visible && <NotePropertiesDialog themeId={this.props.themeId} noteId={notePropertiesDialogOptions.noteId} onClose={this.notePropertiesDialog_close} onRevisionLinkClick={notePropertiesDialogOptions.onRevisionLinkClick} />}
 				{shareNoteDialogOptions.visible && <ShareNoteDialog themeId={this.props.themeId} noteIds={shareNoteDialogOptions.noteIds} onClose={this.shareNoteDialog_close} />}
+				{shareFolderDialogOptions.visible && <ShareFolderDialog themeId={this.props.themeId} folderId={shareFolderDialogOptions.folderId} onClose={this.shareFolderDialog_close} />}

 				<PromptDialog autocomplete={promptOptions && 'autocomplete' in promptOptions ? promptOptions.autocomplete : null} defaultValue={promptOptions && promptOptions.value ? promptOptions.value : ''} themeId={this.props.themeId} style={styles.prompt} onClose={this.promptOnClose_} label={promptOptions ? promptOptions.label : ''} description={promptOptions ? promptOptions.description : null} visible={!!this.state.promptOptions} buttons={promptOptions && 'buttons' in promptOptions ? promptOptions.buttons : null} inputType={promptOptions && 'inputType' in promptOptions ? promptOptions.inputType : null} />

@@ -794,6 +859,7 @@ const mapStateToProps = (state: AppState) => {
 		layoutMoveMode: state.layoutMoveMode,
 		mainLayout: state.mainLayout,
 		startupPluginsLoaded: state.startupPluginsLoaded,
+		shareInvitations: state.shareService.shareInvitations,
 		isSafeMode: state.settings.isSafeMode,
 	};
 };
--- a/packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.ts
+++ b/packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.ts
@@ -0,0 +1,23 @@
+import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
+import { _ } from '@joplin/lib/locale';
+
+export const declaration: CommandDeclaration = {
+	name: 'showShareFolderDialog',
+	label: () => _('Share notebook...'),
+};
+
+export const runtime = (comp: any): CommandRuntime => {
+	return {
+		execute: async (context: CommandContext, folderId: string = null) => {
+			folderId = folderId || context.state.selectedFolderId;
+
+			comp.setState({
+				shareFolderDialogOptions: {
+					folderId,
+					visible: true,
+				},
+			});
+		},
+		enabledCondition: 'joplinServerConnected && (folderIsShareRootAndOwnedByUser || !folderIsShared)',
+	};
+};
--- a/packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.ts
+++ b/packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.ts
@@ -18,5 +18,6 @@ export const runtime = (comp: any): CommandRuntime => {
 				},
 			});
 		},
+		enabledCondition: 'joplinServerConnected && someNotesSelected',
 	};
 };
--- a/packages/app-desktop/gui/MenuBar.tsx
+++ b/packages/app-desktop/gui/MenuBar.tsx
@@ -17,6 +17,7 @@ import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerS
 import menuCommandNames from './menuCommandNames';
 import stateToWhenClauseContext from '../services/commands/stateToWhenClauseContext';
 import bridge from '../services/bridge';
+import checkForUpdates from '../checkForUpdates';

 const { connect } = require('react-redux');
 import { reg } from '@joplin/lib/registry';
@@ -89,6 +90,7 @@ interface Props {
 	['spellChecker.enabled']: boolean;
 	['spellChecker.language']: string;
 	plugins: PluginStates;
+	customCss: string;
 }

 const commandNames: string[] = menuCommandNames();
@@ -312,7 +314,10 @@ function useMenu(props: Props) {
 								await InteropServiceHelper.export(
 									(action: any) => props.dispatch(action),
 									module,
-									{ plugins: props.plugins }
+									{
+										plugins: props.plugins,
+										customCss: props.customCss,
+									}
 								);
 							},
 						});
@@ -430,7 +435,7 @@ function useMenu(props: Props) {
 			toolsItems.push(SpellCheckerService.instance().spellCheckerConfigMenuItem(props['spellChecker.language'], props['spellChecker.enabled']));

 			function _checkForUpdates() {
-				bridge().checkForUpdates(false, bridge().window(), `${Setting.value('profileDir')}/log-autoupdater.txt`, { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
+				void checkForUpdates(false, bridge().window(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
 			}

 			function _showAbout() {
@@ -694,11 +699,18 @@ function useMenu(props: Props) {
 						},
 					],
 				},
+				folder: {
+					label: _('Note&book'),
+					submenu: [
+						menuItemDic.showShareFolderDialog,
+					],
+				},
 				note: {
 					label: _('&Note'),
 					submenu: [
 						menuItemDic.toggleExternalEditing,
 						menuItemDic.setTags,
+						menuItemDic.showShareNoteDialog,
 						separator(),
 						menuItemDic.showNoteContentProperties,
 					],
@@ -817,6 +829,7 @@ function useMenu(props: Props) {
 				rootMenus.edit,
 				rootMenus.view,
 				rootMenus.go,
+				rootMenus.folder,
 				rootMenus.note,
 				rootMenus.tools,
 				rootMenus.help,
@@ -851,7 +864,7 @@ function useMenu(props: Props) {
 			clearTimeout(timeoutId);
 			timeoutId = null;
 		};
-	}, [props.routeName, props.pluginMenuItems, props.pluginMenus, keymapLastChangeTime, modulesLastChangeTime, props['spellChecker.language'], props['spellChecker.enabled'], props.plugins]);
+	}, [props.routeName, props.pluginMenuItems, props.pluginMenus, keymapLastChangeTime, modulesLastChangeTime, props['spellChecker.language'], props['spellChecker.enabled'], props.plugins, props.customCss]);

 	useMenuStates(menu, props);

@@ -908,6 +921,7 @@ const mapStateToProps = (state: AppState) => {
 		['spellChecker.language']: state.settings['spellChecker.language'],
 		['spellChecker.enabled']: state.settings['spellChecker.enabled'],
 		plugins: state.pluginService.plugins,
+		customCss: state.customCss,
 	};
 };

--- a/packages/app-desktop/gui/MultiNoteActions.tsx
+++ b/packages/app-desktop/gui/MultiNoteActions.tsx
@@ -13,6 +13,7 @@ interface MultiNoteActionsProps {
 	watchedNoteFiles: string[];
 	plugins: PluginStates;
 	inConflictFolder: boolean;
+	customCss: string;
 }

 function styles_(props: MultiNoteActionsProps) {
@@ -53,6 +54,7 @@ export default function MultiNoteActions(props: MultiNoteActionsProps) {
 		watchedNoteFiles: props.watchedNoteFiles,
 		plugins: props.plugins,
 		inConflictFolder: props.inConflictFolder,
+		customCss: props.customCss,
 	});

 	const itemComps = [];
--- a/packages/app-desktop/gui/NoteContentPropertiesDialog.tsx
+++ b/packages/app-desktop/gui/NoteContentPropertiesDialog.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { useState, useEffect } from 'react';
 import { _ } from '@joplin/lib/locale';
+import DialogButtonRow from './DialogButtonRow';
 const { themeStyle } = require('@joplin/lib/theme');
-const DialogButtonRow = require('./DialogButtonRow.min');
 const Countable = require('countable');
 import markupLanguageUtils from '../utils/markupLanguageUtils';

@@ -24,7 +24,7 @@ interface KeyToLabelMap {
 let markupToHtml_: any = null;
 function markupToHtml() {
 	if (markupToHtml_) return markupToHtml_;
-	markupToHtml_ = markupLanguageUtils.newMarkupToHtml({});
+	markupToHtml_ = markupLanguageUtils.newMarkupToHtml();
 	return markupToHtml_;
 }

--- a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx
+++ b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useState, useEffect, useCallback, useRef, forwardRef, useImperativeHandle } from 'react';
-import { ScrollOptions, ScrollOptionTypes, EditorCommand, NoteBodyEditorProps } from '../../utils/types';
-import { resourcesStatus, commandAttachFileToBody, handlePasteEvent, processPastedHtml } from '../../utils/resourceHandling';
+import { ScrollOptions, ScrollOptionTypes, EditorCommand, NoteBodyEditorProps, ResourceInfos } from '../../utils/types';
+import { resourcesStatus, commandAttachFileToBody, handlePasteEvent, processPastedHtml, attachedResources } from '../../utils/resourceHandling';
 import useScroll from './utils/useScroll';
 import styles_ from './styles';
 import CommandService from '@joplin/lib/services/CommandService';
@@ -20,6 +20,7 @@ const taboverride = require('taboverride');
 import { reg } from '@joplin/lib/registry';
 import BaseItem from '@joplin/lib/models/BaseItem';
 import setupToolbarButtons from './utils/setupToolbarButtons';
+import { plainTextToHtml } from '@joplin/lib/htmlUtils';
 const { themeStyle } = require('@joplin/lib/theme');
 const { clipboard } = require('electron');
 const supportedLocales = require('./supportedLocales');
@@ -66,6 +67,26 @@ function newBlockSource(language: string = '', content: string = ''): any {
 	};
 }

+// In TinyMCE 5.2, when setting the body to '<div id="rendered-md"></div>',
+// it would end up as '<div id="rendered-md"><br/></div>' once rendered
+// (an additional <br/> was inserted).
+//
+// This behaviour was "fixed" later on, possibly in 5.6, which has this change:
+//
+// - Fixed getContent with text format returning a new line when the editor is empty #TINY-6281
+//
+// The problem is that the list plugin was, unknown to me, relying on this <br/>
+// being present. Without it, trying to add a bullet point or checkbox on an
+// empty document, does nothing. The exact reason for this is unclear
+// so as a workaround we manually add this <br> for empty documents,
+// which fixes the issue.
+//
+// Perhaps upgrading the list plugin (which is a fork of TinyMCE own list plugin)
+// would help?
+function awfulBrHack(html: string): string {
+	return html === '<div id="rendered-md"></div>' ? '<div id="rendered-md"><br/></div>' : html;
+}
+
 function findEditableContainer(node: any): any {
 	while (node) {
 		if (node.classList && node.classList.contains('joplin-editable')) return node;
@@ -127,6 +148,12 @@ const joplinCommandToTinyMceCommands: JoplinCommandToTinyMceCommands = {
 	'search': { name: 'SearchReplace' },
 };

+interface LastOnChangeEventInfo {
+	content: string;
+	resourceInfos: ResourceInfos;
+	contentKey: string;
+}
+
 let loadedCssFiles_: string[] = [];
 let loadedJsFiles_: string[] = [];
 let dispatchDidUpdateIID_: any = null;
@@ -147,7 +174,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 	const markupToHtml = useRef(null);
 	markupToHtml.current = props.markupToHtml;

-	const lastOnChangeEventInfo = useRef<any>({
+	const lastOnChangeEventInfo = useRef<LastOnChangeEventInfo>({
 		content: null,
 		resourceInfos: null,
 		contentKey: null,
@@ -163,7 +190,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 	const { scrollToPercent } = useScroll({ editor, onScroll: props.onScroll });

 	usePluginServiceRegistration(ref);
-	useContextMenu(editor, props.plugins);
+	useContextMenu(editor, props.plugins, props.dispatch);

 	const dispatchDidUpdate = (editor: any) => {
 		if (dispatchDidUpdateIID_) shim.clearTimeout(dispatchDidUpdateIID_);
@@ -338,7 +365,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 			element.id = script.id;

 			element.onload = () => {
-				resolve();
+				resolve(null);
 			};

 			document.getElementsByTagName('head')[0].appendChild(element);
@@ -807,6 +834,25 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 		}
 	};

+	function resourceInfosEqual(ri1: ResourceInfos, ri2: ResourceInfos): boolean {
+		if (ri1 && !ri2 || !ri1 && ri2) return false;
+		if (!ri1 && !ri2) return true;
+
+		const keys1 = Object.keys(ri1);
+		const keys2 = Object.keys(ri2);
+
+		if (keys1.length !== keys2.length) return false;
+
+		// The attachedResources() call that generates the ResourceInfos object
+		// uses cache for the resource objects, so we can use strict equality
+		// for comparison.
+		for (const k of keys1) {
+			if (ri1[k] !== ri2[k]) return false;
+		}
+
+		return true;
+	}
+
 	useEffect(() => {
 		if (!editor) return () => {};

@@ -818,11 +864,13 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 		let cancelled = false;

 		const loadContent = async () => {
-			if (lastOnChangeEventInfo.current.content !== props.content || lastOnChangeEventInfo.current.resourceInfos !== props.resourceInfos) {
+			const resourcesEqual = resourceInfosEqual(lastOnChangeEventInfo.current.resourceInfos, props.resourceInfos);
+
+			if (lastOnChangeEventInfo.current.content !== props.content || !resourcesEqual) {
 				const result = await props.markupToHtml(props.contentMarkupLanguage, props.content, markupRenderOptions({ resourceInfos: props.resourceInfos }));
 				if (cancelled) return;

-				editor.setContent(result.html);
+				editor.setContent(awfulBrHack(result.html));

 				if (lastOnChangeEventInfo.current.contentKey !== props.contentKey) {
 					// Need to clear UndoManager to avoid this problem:
@@ -922,6 +970,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 		const contentMd = await prop_htmlToMarkdownRef.current(info.contentMarkupLanguage, info.editor.getContent(), info.contentOriginalCss);

 		lastOnChangeEventInfo.current.content = contentMd;
+		lastOnChangeEventInfo.current.resourceInfos = await attachedResources(contentMd);

 		props_onChangeRef.current({
 			changeId: info.changeId,
@@ -1017,31 +1066,37 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 		}

 		async function onPaste(event: any) {
+			// We do not use the default pasting behaviour because the input has
+			// to be processed in various ways.
+			event.preventDefault();
+
 			const resourceMds = await handlePasteEvent(event);
 			if (resourceMds.length) {
 				const result = await markupToHtml.current(MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN, resourceMds.join('\n'), markupRenderOptions({ bodyOnly: true }));
 				editor.insertContent(result.html);
 			} else {
-				const pastedText = event.clipboardData.getData('text');
+				const pastedText = event.clipboardData.getData('text/plain');

 				if (BaseItem.isMarkdownTag(pastedText)) { // Paste a link to a note
-					event.preventDefault();
 					const result = await markupToHtml.current(MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN, pastedText, markupRenderOptions({ bodyOnly: true }));
 					editor.insertContent(result.html);
 				} else { // Paste regular text
-					// HACK: TinyMCE doesn't add an undo step when pasting, for unclear reasons
-					// so we manually add it here. We also can't do it immediately it seems, or
-					// else nothing is added to the stack, so do it on the next frame.
-
-					const pastedHtml = clipboard.readHTML();
-					if (pastedHtml) {
-						event.preventDefault();
+					const pastedHtml = event.clipboardData.getData('text/html');
+					if (pastedHtml) { // Handles HTML
 						const modifiedHtml = await processPastedHtml(pastedHtml);
 						editor.insertContent(modifiedHtml);
+					} else { // Handles plain text
+						pasteAsPlainText(pastedText);
 					}

-					window.requestAnimationFrame(() => editor.undoManager.add());
-					onChangeHandler();
+					// This code before was necessary to get undo working after
+					// pasting but it seems it's no longer necessary, so
+					// removing it for now. We also couldn't do it immediately
+					// it seems, or else nothing is added to the stack, so do it
+					// on the next frame.
+					//
+					// window.requestAnimationFrame(() =>
+					// editor.undoManager.add()); onChangeHandler();
 				}
 			}
 		}
@@ -1060,6 +1115,13 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 			onChangeHandler();
 		}

+		function pasteAsPlainText(text: string = null) {
+			const pastedText = text === null ? clipboard.readText() : text;
+			if (pastedText) {
+				editor.insertContent(plainTextToHtml(pastedText));
+			}
+		}
+
 		function onKeyDown(event: any) {
 			// It seems "paste as text" is handled automatically by
 			// on Windows so the code below so we need to run the below
@@ -1072,8 +1134,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 			// it here and we don't need to do anything special in onPaste
 			if (!shim.isWindows()) {
 				if ((event.metaKey || event.ctrlKey) && event.shiftKey && event.code === 'KeyV') {
-					const pastedText = clipboard.readText();
-					if (pastedText) editor.insertContent(pastedText);
+					pasteAsPlainText();
 				}
 			}
 		}
--- a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.ts
+++ b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.ts
@@ -39,11 +39,11 @@ interface ContextMenuActionOptions {

 const contextMenuActionOptions: ContextMenuActionOptions = { current: null };

-export default function(editor: any, plugins: PluginStates) {
+export default function(editor: any, plugins: PluginStates, dispatch: Function) {
 	useEffect(() => {
 		if (!editor) return () => {};

-		const contextMenuItems = menuItems();
+		const contextMenuItems = menuItems(dispatch);

 		function onContextMenu(_event: any, params: any) {
 			const element = contextMenuElement(editor, params.x, params.y);
@@ -110,5 +110,5 @@ export default function(editor: any, plugins: PluginStates) {
 				bridge().window().webContents.off('context-menu', onContextMenu);
 			}
 		};
-	}, [editor, plugins]);
+	}, [editor, plugins, dispatch]);
 }
--- a/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx
+++ b/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx
@@ -156,10 +156,11 @@ function NoteEditor(props: NoteEditorProps) {

 		const markupToHtml = markupLanguageUtils.newMarkupToHtml({}, {
 			resourceBaseUrl: `file://${Setting.value('resourceDir')}/`,
+			customCss: props.customCss,
 		});

 		return markupToHtml.allAssets(markupLanguage, theme);
-	}, [props.themeId]);
+	}, [props.themeId, props.customCss]);

 	const handleProvisionalFlag = useCallback(() => {
 		if (props.isProvisional) {
@@ -458,6 +459,7 @@ function NoteEditor(props: NoteEditorProps) {
 			watchedNoteFiles={props.watchedNoteFiles}
 			plugins={props.plugins}
 			inConflictFolder={props.selectedFolderId === Folder.conflictFolderId()}
+			customCss={props.customCss}
 		/>;
 	}

@@ -549,7 +551,7 @@ function NoteEditor(props: NoteEditorProps) {
 				<div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
 					{renderSearchBar()}
 				</div>
-				<div style={{ paddingLeft: theme.editorPaddingLeft, display: 'flex', flexDirection: 'row', alignItems: 'center', height: 40 }}>
+				<div className="tag-bar" style={{ paddingLeft: theme.editorPaddingLeft, display: 'flex', flexDirection: 'row', alignItems: 'center', height: 40 }}>
 					{renderTagButton()}
 					{renderTagBar()}
 				</div>
--- a/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx
+++ b/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx
@@ -91,7 +91,7 @@ export default function NoteTitleBar(props: Props) {
 	}, []);

 	function renderTitleBarDate() {
-		return <span style={styles.titleDate}>{time.formatMsToLocal(props.noteUserUpdatedTime)}</span>;
+		return <span className="updated-time-label" style={styles.titleDate}>{time.formatMsToLocal(props.noteUserUpdatedTime)}</span>;
 	}

 	function renderNoteToolbar() {
@@ -104,6 +104,7 @@ export default function NoteTitleBar(props: Props) {
 	return (
 		<StyledRoot>
 			<input
+				className="title-input"
 				type="text"
 				ref={props.titleInputRef}
 				placeholder={props.isProvisional ? _('Creating new %s...', props.noteIsTodo ? _('to-do') : _('note')) : ''}
--- a/packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts
+++ b/packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts
@@ -6,7 +6,10 @@ const bridge = require('electron').remote.require('./bridge').default;
 const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
 import Resource from '@joplin/lib/models/Resource';
+import BaseItem from '@joplin/lib/models/BaseItem';
+import BaseModel from '@joplin/lib/BaseModel';
 import { processPastedHtml } from './resourceHandling';
+import { NoteEntity, ResourceEntity } from '@joplin/lib/services/database/types';
 const fs = require('fs-extra');
 const { clipboard } = require('electron');
 const { toSystemSlashes } = require('@joplin/lib/path-utils');
@@ -53,17 +56,50 @@ function handleCopyToClipboard(options: ContextMenuOptions) {
 	}
 }

-export function menuItems(): ContextMenuItems {
+export async function openItemById(itemId: string, dispatch: Function, hash: string = '') {
+
+	const item = await BaseItem.loadItemById(itemId);
+
+	if (!item) throw new Error(`No item with ID ${itemId}`);
+
+	if (item.type_ === BaseModel.TYPE_RESOURCE) {
+		const resource = item as ResourceEntity;
+		const localState = await Resource.localState(resource);
+		if (localState.fetch_status !== Resource.FETCH_STATUS_DONE || !!resource.encryption_blob_encrypted) {
+			if (localState.fetch_status === Resource.FETCH_STATUS_ERROR) {
+				bridge().showErrorMessageBox(`${_('There was an error downloading this attachment:')}\n\n${localState.fetch_error}`);
+			} else {
+				bridge().showErrorMessageBox(_('This attachment is not downloaded or not decrypted yet'));
+			}
+			return;
+		}
+
+		try {
+			await ResourceEditWatcher.instance().openAndWatch(resource.id);
+		} catch (error) {
+			console.error(error);
+			bridge().showErrorMessageBox(error.message);
+		}
+	} else if (item.type_ === BaseModel.TYPE_NOTE) {
+		const note = item as NoteEntity;
+
+		dispatch({
+			type: 'FOLDER_AND_NOTE_SELECT',
+			folderId: note.parent_id,
+			noteId: note.id,
+			hash,
+		});
+	} else {
+		throw new Error(`Unsupported item type: ${item.type_}`);
+	}
+}
+
+export function menuItems(dispatch: Function): ContextMenuItems {
 	return {
 		open: {
 			label: _('Open...'),
 			onAction: async (options: ContextMenuOptions) => {
-				try {
-					await ResourceEditWatcher.instance().openAndWatch(options.resourceId);
-				} catch (error) {
-					console.error(error);
-					bridge().showErrorMessageBox(error.message);
-				}
+				await openItemById(options.resourceId, dispatch);
 			},
 			isActive: (itemType: ContextMenuItemType) => itemType === ContextMenuItemType.Image || itemType === ContextMenuItemType.Resource,
 		},
@@ -134,10 +170,10 @@ export function menuItems(): ContextMenuItems {
 	};
 }

-export default async function contextMenu(options: ContextMenuOptions) {
+export default async function contextMenu(options: ContextMenuOptions, dispatch: Function) {
 	const menu = new Menu();

-	const items = menuItems();
+	const items = menuItems(dispatch);

 	if (!('readyOnly' in options)) options.isReadOnly = true;

--- a/packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts
+++ b/packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts
@@ -135,6 +135,13 @@ export async function processPastedHtml(html: string) {
 	const allImageUrls: string[] = [];
 	const mappedResources: Record<string, string> = {};

+	// When copying text from eg. GitHub, the HTML might contain non-breaking
+	// spaces instead of regular spaces. If these non-breaking spaces are
+	// inserted into the TinyMCE editor (using insertContent), they will be
+	// dropped. So here we convert them to regular spaces.
+	// https://stackoverflow.com/a/31790544/561309
+	html = html.replace(/[\u202F\u00A0]/g, ' ');
+
 	htmlUtils.replaceImageUrls(html, (src: string) => {
 		allImageUrls.push(src);
 	});
--- a/packages/app-desktop/gui/NoteEditor/utils/types.ts
+++ b/packages/app-desktop/gui/NoteEditor/utils/types.ts
@@ -2,6 +2,8 @@
 import AsyncActionQueue from '@joplin/lib/AsyncActionQueue';
 import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
 import { PluginStates } from '@joplin/lib/services/plugins/reducer';
+import { MarkupLanguage } from '@joplin/renderer';
+import { RenderResult, RenderResultPluginAsset } from '@joplin/renderer/MarkupToHtml';

 export interface ToolbarButtonInfos {
 	[key: string]: ToolbarButtonInfo;
@@ -49,9 +51,9 @@ export interface NoteBodyEditorProps {
 	onWillChange(event: any): void;
 	onMessage(event: any): void;
 	onScroll(event: any): void;
-	markupToHtml: Function;
+	markupToHtml: (markupLanguage: MarkupLanguage, markup: string, options: any)=> Promise<RenderResult>;
 	htmlToMarkdown: Function;
-	allAssets: Function;
+	allAssets: (markupLanguage: MarkupLanguage)=> Promise<RenderResultPluginAsset[]>;
 	disabled: boolean;
 	dispatch: Function;
 	noteToolbar: any;
--- a/packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.ts
+++ b/packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.ts
@@ -24,6 +24,7 @@ export default function useMarkupToHtml(deps: HookDependencies) {
 	const markupToHtml = useMemo(() => {
 		return markupLanguageUtils.newMarkupToHtml(deps.plugins, {
 			resourceBaseUrl: `file://${Setting.value('resourceDir')}/`,
+			customCss: customCss || '',
 		});
 	}, [plugins]);

@@ -49,7 +50,6 @@ export default function useMarkupToHtml(deps: HookDependencies) {

 		const result = await markupToHtml.render(markupLanguage, md, theme, Object.assign({}, {
 			codeTheme: theme.codeThemeCss,
-			userCss: customCss || '',
 			resources: resources,
 			postMessageSyntax: 'ipcProxySendToHost',
 			splitted: true,
--- a/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts
+++ b/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts
@@ -1,13 +1,9 @@
 import { useCallback } from 'react';
 import { FormNote } from './types';
-import contextMenu from './contextMenu';
-import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index';
+import contextMenu, { openItemById } from './contextMenu';
 import { _ } from '@joplin/lib/locale';
 import CommandService from '@joplin/lib/services/CommandService';
 import PostMessageService from '@joplin/lib/services/PostMessageService';
-import BaseItem from '@joplin/lib/models/BaseItem';
-import BaseModel from '@joplin/lib/BaseModel';
-import Resource from '@joplin/lib/models/Resource';
 const bridge = require('electron').remote.require('./bridge').default;
 const { urlDecode } = require('@joplin/lib/string-utils');
 const urlUtils = require('@joplin/lib/urlUtils');
@@ -46,43 +42,13 @@ export default function useMessageHandler(scrollWhenReady: any, setScrollWhenRea
 				linkToCopy: arg0.linkToCopy || null,
 				htmlToCopy: '',
 				insertContent: () => { console.warn('insertContent() not implemented'); },
-			});
+			}, dispatch);

 			menu.popup(bridge().window());
 		} else if (msg.indexOf('joplin://') === 0) {
-			const resourceUrlInfo = urlUtils.parseResourceUrl(msg);
-			const itemId = resourceUrlInfo.itemId;
-			const item = await BaseItem.loadItemById(itemId);
+			const { itemId, hash } = urlUtils.parseResourceUrl(msg);
+			await openItemById(itemId, dispatch, hash);

-			if (!item) throw new Error(`No item with ID ${itemId}`);
-
-			if (item.type_ === BaseModel.TYPE_RESOURCE) {
-				const localState = await Resource.localState(item);
-				if (localState.fetch_status !== Resource.FETCH_STATUS_DONE || !!item.encryption_blob_encrypted) {
-					if (localState.fetch_status === Resource.FETCH_STATUS_ERROR) {
-						bridge().showErrorMessageBox(`${_('There was an error downloading this attachment:')}\n\n${localState.fetch_error}`);
-					} else {
-						bridge().showErrorMessageBox(_('This attachment is not downloaded or not decrypted yet'));
-					}
-					return;
-				}
-
-				try {
-					await ResourceEditWatcher.instance().openAndWatch(item.id);
-				} catch (error) {
-					console.error(error);
-					bridge().showErrorMessageBox(error.message);
-				}
-			} else if (item.type_ === BaseModel.TYPE_NOTE) {
-				dispatch({
-					type: 'FOLDER_AND_NOTE_SELECT',
-					folderId: item.parent_id,
-					noteId: item.id,
-					hash: resourceUrlInfo.hash,
-				});
-			} else {
-				throw new Error(`Unsupported item type: ${item.type_}`);
-			}
 		} else if (urlUtils.urlProtocol(msg)) {
 			if (msg.indexOf('file://') === 0) {
 				// When using the file:// protocol, openPath doesn't work (does nothing) with URL-encoded paths
--- a/packages/app-desktop/gui/NoteList/NoteList.tsx
+++ b/packages/app-desktop/gui/NoteList/NoteList.tsx
@@ -125,6 +125,7 @@ class NoteListComponent extends React.Component {
 			watchedNoteFiles: this.props.watchedNoteFiles,
 			plugins: this.props.plugins,
 			inConflictFolder: this.props.selectedFolderId === Folder.conflictFolderId(),
+			customCss: this.props.customCss,
 		});

 		menu.popup(bridge().window());
@@ -513,6 +514,7 @@ const mapStateToProps = (state: AppState) => {
 		noteSortOrder: state.settings['notes.sortOrder.field'],
 		highlightedWords: state.highlightedWords,
 		plugins: state.pluginService.plugins,
+		customCss: state.customCss,
 	};
 };

--- a/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
+++ b/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
@@ -54,12 +54,14 @@ export default function NoteListControls(props: Props) {
 		return (
 			<ButtonContainer>
 				<StyledButton
+					className="new-todo-button"
 					tooltip={CommandService.instance().label('newTodo')}
 					iconName="far fa-check-square"
 					level={ButtonLevel.Primary}
 					onClick={onNewTodoButtonClick}
 				/>
 				<StyledButton
+					className="new-note-button"
 					tooltip={CommandService.instance().label('newNote')}
 					iconName="icon-note"
 					level={ButtonLevel.Primary}
--- a/packages/app-desktop/gui/NoteListItem.tsx
+++ b/packages/app-desktop/gui/NoteListItem.tsx
@@ -110,6 +110,7 @@ function NoteListItem(props: NoteListItemProps, ref: any) {

 	let listItemTitleStyle = Object.assign({}, props.style.listItemTitle);
 	listItemTitleStyle.paddingLeft = !item.is_todo ? hPadding : 4;
+	if (item.is_shared) listItemTitleStyle.color = theme.colorWarn;
 	if (item.is_todo && !!item.todo_completed) listItemTitleStyle = Object.assign(listItemTitleStyle, props.style.listItemTitleCompleted);

 	const displayTitle = Note.displayTitle(item);
@@ -149,12 +150,21 @@ function NoteListItem(props: NoteListItemProps, ref: any) {
 		color: theme.color,
 	};
 	const watchedIcon = props.isWatched ? null : <i style={watchedIconStyle} className={'fa fa-share-square'}></i>;
+	const classNames = [
+		'list-item-container',
+		props.isSelected && 'selected',
+		item.todo_completed && 'todo-completed',
+		item.is_todo ? 'todo-list-item' : 'note-list-item',
+		(props.index + 1) % 2 === 0 ? 'even' : 'odd',
+	]
+		.filter(e => !!e)
+		.join(' ');

 	// Need to include "todo_completed" in key so that checkbox is updated when
 	// item is changed via sync.
 	return (
 		<StyledRoot
-			className="list-item-container"
+			className={classNames}
 			onDragOver={props.onNoteDragOver}
 			onDrop={props.onNoteDrop}
 			width={props.width}
--- a/packages/app-desktop/gui/NotePropertiesDialog.jsx
+++ b/packages/app-desktop/gui/NotePropertiesDialog.jsx
@@ -2,7 +2,7 @@ const React = require('react');
 const { _ } = require('@joplin/lib/locale');
 const { themeStyle } = require('@joplin/lib/theme');
 const time = require('@joplin/lib/time').default;
-const DialogButtonRow = require('./DialogButtonRow.min');
+const DialogButtonRow = require('./DialogButtonRow').default;
 const Datetime = require('react-datetime');
 const Note = require('@joplin/lib/models/Note').default;
 const formatcoords = require('formatcoords');
--- a/packages/app-desktop/gui/NoteRevisionViewer.jsx
+++ b/packages/app-desktop/gui/NoteRevisionViewer.jsx
@@ -118,11 +118,11 @@ class NoteRevisionViewerComponent extends React.PureComponent {

 		const markupToHtml = markupLanguageUtils.newMarkupToHtml({}, {
 			resourceBaseUrl: `file://${Setting.value('resourceDir')}/`,
+			customCss: this.props.customCss ? this.props.customCss : '',
 		});

 		const result = await markupToHtml.render(markupLanguage, noteBody, theme, {
 			codeTheme: theme.codeThemeCss,
-			userCss: this.props.customCss ? this.props.customCss : '',
 			resources: await shared.attachedResources(noteBody),
 			postMessageSyntax: 'ipcProxySendToHost',
 		});
--- a/packages/app-desktop/gui/NoteSearchBar.jsx
+++ b/packages/app-desktop/gui/NoteSearchBar.jsx
@@ -158,7 +158,7 @@ class NoteSearchBarComponent extends React.Component {
 		);

 		return (
-			<div style={this.props.style}>
+			<div className="note-search-bar" style={this.props.style}>
 				<div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
 					{closeButton}
 					<input
--- a/packages/app-desktop/gui/PromptDialog.jsx
+++ b/packages/app-desktop/gui/PromptDialog.jsx
@@ -221,11 +221,11 @@ class PromptDialog extends React.Component {
 		let inputComp = null;

 		if (this.props.inputType === 'datetime') {
-			inputComp = <Datetime value={this.state.answer} inputProps={{ style: styles.input }} dateFormat={time.dateFormat()} timeFormat={time.timeFormat()} onChange={momentObject => onDateTimeChange(momentObject)} />;
+			inputComp = <Datetime className="datetime-picker" value={this.state.answer} inputProps={{ style: styles.input }} dateFormat={time.dateFormat()} timeFormat={time.timeFormat()} onChange={momentObject => onDateTimeChange(momentObject)} />;
 		} else if (this.props.inputType === 'tags') {
-			inputComp = <CreatableSelect styles={styles.select} theme={styles.selectTheme} ref={this.answerInput_} value={this.state.answer} placeholder="" components={makeAnimated()} isMulti={true} isClearable={false} backspaceRemovesValue={true} options={this.props.autocomplete} onChange={onSelectChange} onKeyDown={event => onKeyDown(event)} />;
+			inputComp = <CreatableSelect className="tag-selector" styles={styles.select} theme={styles.selectTheme} ref={this.answerInput_} value={this.state.answer} placeholder="" components={makeAnimated()} isMulti={true} isClearable={false} backspaceRemovesValue={true} options={this.props.autocomplete} onChange={onSelectChange} onKeyDown={event => onKeyDown(event)} />;
 		} else if (this.props.inputType === 'dropdown') {
-			inputComp = <Select styles={styles.select} theme={styles.selectTheme} ref={this.answerInput_} components={makeAnimated()} value={this.props.answer} defaultValue={this.props.defaultValue} isClearable={false} options={this.props.autocomplete} onChange={onSelectChange} onKeyDown={event => onKeyDown(event)} />;
+			inputComp = <Select className="item-selector" styles={styles.select} theme={styles.selectTheme} ref={this.answerInput_} components={makeAnimated()} value={this.props.answer} defaultValue={this.props.defaultValue} isClearable={false} options={this.props.autocomplete} onChange={onSelectChange} onKeyDown={event => onKeyDown(event)} />;
 		} else {
 			inputComp = <input style={styles.input} ref={this.answerInput_} value={this.state.answer} type="text" onChange={event => onChange(event)} onKeyDown={event => onKeyDown(event)} />;
 		}
@@ -254,8 +254,8 @@ class PromptDialog extends React.Component {
 		}

 		return (
-			<div style={styles.modalLayer}>
-				<div style={styles.promptDialog}>
+			<div className="modal-layer" style={styles.modalLayer}>
+				<div className="modal-dialog" style={styles.promptDialog}>
 					<label style={styles.label}>{this.props.label ? this.props.label : ''}</label>
 					<div style={{ display: 'inline-block', color: 'black', backgroundColor: theme.backgroundColor }}>
 						{inputComp}
--- a/packages/app-desktop/gui/ResizableLayout/ResizableLayout.tsx
+++ b/packages/app-desktop/gui/ResizableLayout/ResizableLayout.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { useRef, useState, useEffect } from 'react';
 import useWindowResizeEvent from './utils/useWindowResizeEvent';
 import setLayoutItemProps from './utils/setLayoutItemProps';
-import useLayoutItemSizes, { LayoutItemSizes, itemSize } from './utils/useLayoutItemSizes';
+import useLayoutItemSizes, { LayoutItemSizes, itemSize, calculateMaxSizeAvailableForItem, itemMinWidth, itemMinHeight } from './utils/useLayoutItemSizes';
 import validateLayout from './utils/validateLayout';
 import { Size, LayoutItem } from './utils/types';
 import { canMove, MoveDirection } from './utils/movements';
@@ -11,9 +11,6 @@ import { StyledWrapperRoot, StyledMoveOverlay, MoveModeRootWrapper, MoveModeRoot
 import { Resizable } from 're-resizable';
 const EventEmitter = require('events');

-const itemMinWidth = 20;
-const itemMinHeight = 20;
-
 interface onResizeEvent {
 	layout: LayoutItem;
 }
@@ -35,7 +32,7 @@ function itemVisible(item: LayoutItem, moveMode: boolean) {
 	return item.visible !== false;
 }

-function renderContainer(item: LayoutItem, parent: LayoutItem | null, sizes: LayoutItemSizes, onResizeStart: Function, onResize: Function, onResizeStop: Function, children: any[], isLastChild: boolean, moveMode: boolean): any {
+function renderContainer(item: LayoutItem, parent: LayoutItem | null, sizes: LayoutItemSizes, resizedItemMaxSize: Size | null, onResizeStart: Function, onResize: Function, onResizeStop: Function, children: any[], isLastChild: boolean, moveMode: boolean): any {
 	const style: any = {
 		display: itemVisible(item, moveMode) ? 'flex' : 'none',
 		flexDirection: item.direction,
@@ -68,6 +65,8 @@ function renderContainer(item: LayoutItem, parent: LayoutItem | null, sizes: Lay
 				enable={enable}
 				minWidth={'minWidth' in item ? item.minWidth : itemMinWidth}
 				minHeight={'minHeight' in item ? item.minHeight : itemMinHeight}
+				maxWidth={resizedItemMaxSize?.width}
+				maxHeight={resizedItemMaxSize?.height}
 			>
 				{children}
 			</Resizable>
@@ -114,6 +113,7 @@ function ResizableLayout(props: Props) {
 				key: item.key,
 				initialWidth: sizes[item.key].width,
 				initialHeight: sizes[item.key].height,
+				maxSize: calculateMaxSizeAvailableForItem(item, parent, sizes),
 			});
 		}

@@ -143,6 +143,7 @@ function ResizableLayout(props: Props) {
 			setResizedItem(null);
 		}

+		const resizedItemMaxSize = item.key === resizedItem?.key ? resizedItem.maxSize : null;
 		if (!item.children) {
 			const size = itemSize(item, parent, sizes, false);

@@ -155,7 +156,7 @@ function ResizableLayout(props: Props) {

 			const wrapper = renderItemWrapper(comp, item, parent, size, props.moveMode);

-			return renderContainer(item, parent, sizes, onResizeStart, onResize, onResizeStop, [wrapper], isLastChild, props.moveMode);
+			return renderContainer(item, parent, sizes, resizedItemMaxSize, onResizeStart, onResize, onResizeStop, [wrapper], isLastChild, props.moveMode);
 		} else {
 			const childrenComponents = [];
 			for (let i = 0; i < item.children.length; i++) {
@@ -163,7 +164,7 @@ function ResizableLayout(props: Props) {
 				childrenComponents.push(renderLayoutItem(child, item, sizes, isVisible && itemVisible(child, props.moveMode), i === item.children.length - 1));
 			}

-			return renderContainer(item, parent, sizes, onResizeStart, onResize, onResizeStop, childrenComponents, isLastChild, props.moveMode);
+			return renderContainer(item, parent, sizes, resizedItemMaxSize, onResizeStart, onResize, onResizeStop, childrenComponents, isLastChild, props.moveMode);
 		}
 	}

--- a/packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.ts
+++ b/packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.ts
@@ -0,0 +1,30 @@
+import produce from 'immer';
+import iterateItems from './iterateItems';
+import { LayoutItem } from './types';
+import validateLayout from './validateLayout';
+
+interface ItemToRemove {
+	parent: LayoutItem;
+	index: number;
+}
+
+export default function(layout: LayoutItem): LayoutItem {
+	const itemsToRemove: ItemToRemove[] = [];
+
+	const output = produce(layout, (layoutDraft: LayoutItem) => {
+		iterateItems(layoutDraft, (itemIndex: number, item: LayoutItem, parent: LayoutItem) => {
+			if (!item.key) itemsToRemove.push({ parent, index: itemIndex });
+			return true;
+		});
+
+		itemsToRemove.sort((a: ItemToRemove, b: ItemToRemove) => {
+			return a.index > b.index ? -1 : +1;
+		});
+
+		for (const item of itemsToRemove) {
+			item.parent.children.splice(item.index, 1);
+		}
+	});
+
+	return output !== layout ? validateLayout(output) : layout;
+}
--- a/packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.test.ts
+++ b/packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.test.ts
@@ -1,4 +1,4 @@
-import useLayoutItemSizes, { itemSize } from './useLayoutItemSizes';
+import useLayoutItemSizes, { itemSize, calculateMaxSizeAvailableForItem } from './useLayoutItemSizes';
 import { LayoutItem, LayoutItemDirection } from './types';
 import { renderHook } from '@testing-library/react-hooks';
 import validateLayout from './validateLayout';
@@ -138,4 +138,219 @@ describe('useLayoutItemSizes', () => {
 		expect(itemSize(parent.children[1], parent, sizes, false)).toEqual({ width: 95, height: 50 });
 	});

+	test('should decrease size of the largest item if the total size would be larger than the container', () => {
+		const layout: LayoutItem = validateLayout({
+			key: 'root',
+			width: 200,
+			height: 100,
+			direction: LayoutItemDirection.Row,
+			children: [
+				{
+					key: 'col1',
+					width: 110,
+				},
+				{
+					key: 'col2',
+					width: 100,
+				},
+				{
+					key: 'col3',
+					minWidth: 50,
+				},
+			],
+		});
+
+		const { result } = renderHook(() => useLayoutItemSizes(layout));
+		const sizes = result.current;
+
+		expect(sizes.col1.width).toBe(50);
+		expect(sizes.col2.width).toBe(100);
+		expect(sizes.col3.width).toBe(50);
+	});
+
+	test('should not allow a minWidth of 0, should still make space for the item', () => {
+		const layout: LayoutItem = validateLayout({
+			key: 'root',
+			width: 200,
+			height: 100,
+			direction: LayoutItemDirection.Row,
+			children: [
+				{
+					key: 'col1',
+					width: 210,
+				},
+				{
+					key: 'col2',
+					minWidth: 0,
+				},
+			],
+		});
+
+		const { result } = renderHook(() => useLayoutItemSizes(layout));
+		const sizes = result.current;
+
+		expect(sizes.col1.width).toBe(160);
+		expect(sizes.col2.width).toBe(40); // default minWidth is 40
+	});
+
+	test('should ignore invisible items when counting remaining size', () => {
+		const layout: LayoutItem = validateLayout({
+			key: 'root',
+			width: 200,
+			height: 100,
+			direction: LayoutItemDirection.Row,
+			children: [
+				{
+					key: 'col1',
+					width: 110,
+					visible: false,
+				},
+				{
+					key: 'col2',
+					width: 100,
+				},
+				{
+					key: 'col3',
+					minWidth: 50,
+				},
+			],
+		});
+
+		const { result } = renderHook(() => useLayoutItemSizes(layout));
+		const sizes = result.current;
+
+		expect(sizes.col1.width).toBe(0);
+		expect(sizes.col2.width).toBe(100);
+		expect(sizes.col3.width).toBe(100);
+	});
+
+	test('should ignore invisible items when selecting largest child', () => {
+		const layout: LayoutItem = validateLayout({
+			key: 'root',
+			width: 200,
+			height: 100,
+			direction: LayoutItemDirection.Row,
+			children: [
+				{
+					key: 'col1',
+					width: 110,
+					visible: false,
+				},
+				{
+					key: 'col2',
+					width: 100,
+				},
+				{
+					key: 'col3',
+					width: 110,
+				},
+				{
+					key: 'col4',
+					minWidth: 50,
+				},
+			],
+		});
+
+		const { result } = renderHook(() => useLayoutItemSizes(layout));
+		const sizes = result.current;
+
+		expect(sizes.col1.width).toBe(0);
+		expect(sizes.col2.width).toBe(100);
+		expect(sizes.col3.width).toBe(50);
+		expect(sizes.col4.width).toBe(50);
+	});
+
+});
+
+describe('calculateMaxSizeAvailableForItem', () => {
+
+	test('should give maximum available space this item can take up during resizing', () => {
+		const layout: LayoutItem = validateLayout({
+			key: 'root',
+			width: 200,
+			height: 100,
+			direction: LayoutItemDirection.Row,
+			children: [
+				{
+					key: 'col1',
+					width: 50,
+				},
+				{
+					key: 'col2',
+					width: 70,
+				},
+				{
+					key: 'col3',
+				},
+			],
+		});
+
+		const { result } = renderHook(() => useLayoutItemSizes(layout));
+		const sizes = result.current;
+		const maxSize1 = calculateMaxSizeAvailableForItem(layout.children[0], layout, sizes);
+		const maxSize2 = calculateMaxSizeAvailableForItem(layout.children[1], layout, sizes);
+
+		// maxSize = totalSize - ( [size of items with set size, except for the current item] + [minimum size of items with no set size] )
+		expect(maxSize1.width).toBe(90); // 90 = layout.width - (col2.width + col3.minWidth(=40) )
+		expect(maxSize2.width).toBe(110); // 110 = layout.width - (col1.width + col3.minWidth(=40) )
+	});
+
+	test('should respect minimum sizes', () => {
+		const layout: LayoutItem = validateLayout({
+			key: 'root',
+			width: 200,
+			height: 100,
+			direction: LayoutItemDirection.Row,
+			children: [
+				{
+					key: 'col1',
+					width: 50,
+				},
+				{
+					key: 'col2',
+					width: 70,
+				},
+				{
+					key: 'col3',
+					minWidth: 60,
+				},
+			],
+		});
+
+		const { result } = renderHook(() => useLayoutItemSizes(layout));
+		const sizes = result.current;
+		const maxSize1 = calculateMaxSizeAvailableForItem(layout.children[0], layout, sizes);
+		const maxSize2 = calculateMaxSizeAvailableForItem(layout.children[1], layout, sizes);
+
+		// maxSize = totalSize - ( [size of items with set size, except for the current item] + [minimum size of items with no set size] )
+		expect(maxSize1.width).toBe(70); // 70 = layout.width - (col2.width + col3.minWidth)
+		expect(maxSize2.width).toBe(90); // 90 = layout.width - (col1.width + col3.minWidth)
+	});
+
+	test('should not allow a minWidth of 0, should still leave space for the item', () => {
+		const layout: LayoutItem = validateLayout({
+			key: 'root',
+			width: 200,
+			height: 100,
+			direction: LayoutItemDirection.Row,
+			children: [
+				{
+					key: 'col1',
+					width: 50,
+				},
+				{
+					key: 'col2',
+					minWidth: 0,
+				},
+			],
+		});
+
+		const { result } = renderHook(() => useLayoutItemSizes(layout));
+		const sizes = result.current;
+		const maxSize1 = calculateMaxSizeAvailableForItem(layout.children[0], layout, sizes);
+
+		// maxSize = totalSize - ( [size of items with set size, except for the current item] + [minimum size of items with no set size] )
+		expect(maxSize1.width).toBe(160); // 160 = layout.width - col2.minWidth(=40)
+	});
+
 });
--- a/packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.ts
+++ b/packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.ts
@@ -3,6 +3,9 @@ import { LayoutItem, Size } from './types';

 const dragBarThickness = 5;

+export const itemMinWidth = 40;
+export const itemMinHeight = 40;
+
 export interface LayoutItemSizes {
 	[key: string]: Size;
 }
@@ -17,8 +20,8 @@ export function itemSize(item: LayoutItem, parent: LayoutItem | null, sizes: Lay
 	const bottomGap = !isContainer && (item.resizableBottom || parentResizableBottom) ? dragBarThickness : 0;

 	return {
-		width: ('width' in item ? item.width : sizes[item.key].width) - rightGap,
-		height: ('height' in item ? item.height : sizes[item.key].height) - bottomGap,
+		width: sizes[item.key].width - rightGap,
+		height: sizes[item.key].height - bottomGap,
 	};
 }

@@ -38,6 +41,10 @@ function calculateChildrenSizes(item: LayoutItem, parent: LayoutItem | null, siz
 	const noWidthChildren: any[] = [];
 	const noHeightChildren: any[] = [];

+	// The minimum space required for items with no defined size
+	let noWidthChildrenMinWidth = 0;
+	let noHeightChildrenMinHeight = 0;
+
 	for (const child of item.children) {
 		let w = 'width' in child ? child.width : null;
 		let h = 'height' in child ? child.height : null;
@@ -47,10 +54,43 @@ function calculateChildrenSizes(item: LayoutItem, parent: LayoutItem | null, siz
 		}

 		sizes[child.key] = { width: w, height: h };
+
 		if (w !== null) remainingSize.width -= w;
 		if (h !== null) remainingSize.height -= h;
-		if (w === null) noWidthChildren.push({ item: child, parent: item });
-		if (h === null) noHeightChildren.push({ item: child, parent: item });
+		if (w === null) {
+			noWidthChildren.push({ item: child, parent: item });
+			noWidthChildrenMinWidth += child.minWidth || itemMinWidth;
+		}
+		if (h === null) {
+			noHeightChildren.push({ item: child, parent: item });
+			noHeightChildrenMinHeight += child.minHeight || itemMinHeight;
+		}
+	}
+
+	while (remainingSize.width < noWidthChildrenMinWidth) {
+		// There is not enough space, the widest item will be made smaller
+		let widestChild = item.children[0].key;
+		for (const child of item.children) {
+			if (!child.visible) continue;
+			if (sizes[child.key].width > sizes[widestChild].width) widestChild = child.key;
+		}
+
+		const dw = Math.abs(remainingSize.width - noWidthChildrenMinWidth);
+		sizes[widestChild].width -= dw;
+		remainingSize.width += dw;
+	}
+
+	while (remainingSize.height < noHeightChildrenMinHeight) {
+		// There is not enough space, the tallest item will be made smaller
+		let tallestChild = item.children[0].key;
+		for (const child of item.children) {
+			if (!child.visible) continue;
+			if (sizes[child.key].height > sizes[tallestChild].height) tallestChild = child.key;
+		}
+
+		const dh = Math.abs(remainingSize.height - noHeightChildrenMinHeight);
+		sizes[tallestChild].height -= dh;
+		remainingSize.height += dh;
 	}

 	if (noWidthChildren.length) {
@@ -77,6 +117,24 @@ function calculateChildrenSizes(item: LayoutItem, parent: LayoutItem | null, siz
 	return sizes;
 }

+// Gives the maximum available space for this item that it can take up during resizing
+// availableSize = totalSize - ( [size of items with set size, except for the current item] + [minimum size of items with no set size] )
+export function calculateMaxSizeAvailableForItem(item: LayoutItem, parent: LayoutItem, sizes: LayoutItemSizes): Size {
+	const availableSize: Size = { ...sizes[parent.key] };
+
+	for (const sibling of parent.children) {
+		if (!sibling.visible) continue;
+
+		availableSize.width -= 'width' in sibling ? sizes[sibling.key].width : (sibling.minWidth || itemMinWidth);
+		availableSize.height -= 'height' in sibling ? sizes[sibling.key].height : (sibling.minHeight || itemMinHeight);
+	}
+
+	availableSize.width += sizes[item.key].width;
+	availableSize.height += sizes[item.key].height;
+
+	return availableSize;
+}
+
 export default function useLayoutItemSizes(layout: LayoutItem, makeAllVisible: boolean = false) {
 	return useMemo(() => {
 		let sizes: LayoutItemSizes = {};
--- a/packages/app-desktop/gui/SearchBar/SearchBar.tsx
+++ b/packages/app-desktop/gui/SearchBar/SearchBar.tsx
@@ -126,7 +126,7 @@ function SearchBar(props: Props) {
 	}, [props.notesParentType, onExitSearch]);

 	return (
-		<Root>
+		<Root className="search-bar">
 			<SearchInput
 				inputRef={props.inputRef}
 				value={query}
--- a/packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx
+++ b/packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx
@@ -0,0 +1,336 @@
+import Dialog from '../Dialog';
+import DialogButtonRow, { ClickEvent, ButtonSpec } from '../DialogButtonRow';
+import DialogTitle from '../DialogTitle';
+import { _ } from '@joplin/lib/locale';
+import { useEffect, useState } from 'react';
+import { FolderEntity } from '@joplin/lib/services/database/types';
+import Folder from '@joplin/lib/models/Folder';
+import ShareService from '@joplin/lib/services/share/ShareService';
+import styled from 'styled-components';
+import StyledFormLabel from '../style/StyledFormLabel';
+import StyledInput from '../style/StyledInput';
+import Button from '../Button/Button';
+import Logger from '@joplin/lib/Logger';
+import StyledMessage from '../style/StyledMessage';
+import { ShareUserStatus, StateShare, StateShareUser } from '@joplin/lib/services/share/reducer';
+import { State } from '@joplin/lib/reducer';
+import { connect } from 'react-redux';
+import { reg } from '@joplin/lib/registry';
+
+const logger = Logger.create('ShareFolderDialog');
+
+const StyledFolder = styled.div`
+	border: 1px solid ${(props) => props.theme.dividerColor};
+	padding: 0.5em;
+	margin-bottom: 1em;
+	display: flex;
+	align-items: center;
+`;
+
+const StyledRecipientControls = styled.div`
+	display: flex;
+	flex-direction: row;
+`;
+
+const StyledRecipientInput = styled(StyledInput)`
+	width: 100%;
+	margin-right: 10px;
+`;
+
+const StyledAddRecipient = styled.div`
+	margin-bottom: 1em;
+`;
+
+const StyledRecipient = styled(StyledMessage)`
+	display: flex;
+	flex-direction: row;
+	padding: .6em 1em;
+	background-color: ${props => props.index % 2 === 0 ? props.theme.backgroundColor : props.theme.oddBackgroundColor};
+	align-items: center;
+`;
+
+const StyledRecipientName = styled.div`
+	display: flex;
+	flex: 1;
+`;
+
+const StyledRecipientStatusIcon = styled.i`
+	margin-right: .6em;
+`;
+
+const StyledRecipients = styled.div`
+	
+`;
+
+const StyledRecipientList = styled.div`
+	border: 1px solid ${(props: any) => props.theme.dividerColor};
+	border-radius: 3px;
+	height: 300px;
+	overflow-x: hidden;
+	overflow-y: scroll;
+`;
+
+const StyledError = styled(StyledMessage)`
+	word-break: break-all;
+	margin-bottom: 1em;
+`;
+
+const StyledShareState = styled(StyledMessage)`
+	word-break: break-all;
+	margin-bottom: 1em;
+`;
+
+const StyledIcon = styled.i`
+	margin-right: 8px;
+`;
+
+interface Props {
+	themeId: number;
+	folderId: string;
+	onClose(): void;
+	shares: StateShare[];
+	shareUsers: Record<string, StateShareUser[]>;
+}
+
+interface RecipientDeleteEvent {
+	shareUserId: string;
+}
+
+interface AsyncEffectEvent {
+	cancelled: boolean;
+}
+
+function useAsyncEffect(effect: Function, dependencies: any[]) {
+	useEffect(() => {
+		const event = { cancelled: false };
+		effect(event);
+		return () => {
+			event.cancelled = true;
+		};
+	}, dependencies);
+}
+
+enum ShareState {
+	Idle = 0,
+	Synchronizing = 1,
+	Creating = 2,
+}
+
+function ShareFolderDialog(props: Props) {
+	const [folder, setFolder] = useState<FolderEntity>(null);
+	const [recipientEmail, setRecipientEmail] = useState<string>('');
+	const [latestError, setLatestError] = useState<Error>(null);
+	const [share, setShare] = useState<StateShare>(null);
+	const [shareUsers, setShareUsers] = useState<StateShareUser[]>([]);
+	const [shareState, setShareState] = useState<ShareState>(ShareState.Idle);
+	const [customButtons, setCustomButtons] = useState<ButtonSpec[]>([]);
+
+	async function synchronize(event: AsyncEffectEvent = null) {
+		setShareState(ShareState.Synchronizing);
+		await reg.waitForSyncFinishedThenSync();
+		if (event && event.cancelled) return;
+		setShareState(ShareState.Idle);
+	}
+
+	useAsyncEffect(async (event: AsyncEffectEvent) => {
+		const f = await Folder.load(props.folderId);
+		if (event.cancelled) return;
+		setFolder(f);
+	}, [props.folderId]);
+
+	useEffect(() => {
+		void ShareService.instance().refreshShares();
+	}, []);
+
+	useAsyncEffect(async (event: AsyncEffectEvent) => {
+		await synchronize(event);
+	}, []);
+
+	useEffect(() => {
+		const s = props.shares.find(s => s.folder_id === props.folderId);
+		setShare(s);
+	}, [props.shares]);
+
+	useEffect(() => {
+		if (!share) return;
+		void ShareService.instance().refreshShareUsers(share.id);
+	}, [share]);
+
+	useEffect(() => {
+		setCustomButtons(share ? [{
+			name: 'unshare',
+			label: _('Unshare'),
+		}] : []);
+	}, [share]);
+
+	useEffect(() => {
+		if (!share) return;
+		const sus = props.shareUsers[share.id];
+		if (!sus) return;
+		setShareUsers(sus);
+	}, [share, props.shareUsers]);
+
+	useEffect(() => {
+		void ShareService.instance().refreshShares();
+	}, [props.folderId]);
+
+	async function shareRecipient_click() {
+		setShareState(ShareState.Creating);
+
+		try {
+			setLatestError(null);
+			const share = await ShareService.instance().shareFolder(props.folderId);
+			await ShareService.instance().addShareRecipient(share.id, recipientEmail);
+			await Promise.all([
+				ShareService.instance().refreshShares(),
+				ShareService.instance().refreshShareUsers(share.id),
+			]);
+			setRecipientEmail('');
+
+			await synchronize();
+		} catch (error) {
+			logger.error(error);
+			setLatestError(error);
+		} finally {
+			setShareState(ShareState.Idle);
+		}
+	}
+
+	function recipientEmail_change(event: any) {
+		setRecipientEmail(event.target.value);
+	}
+
+	async function recipient_delete(event: RecipientDeleteEvent) {
+		if (!confirm(_('Delete this invitation? The recipient will no longer have access to this shared notebook.'))) return;
+
+		await ShareService.instance().deleteShareRecipient(event.shareUserId);
+		await ShareService.instance().refreshShareUsers(share.id);
+	}
+
+	function renderFolder() {
+		return (
+			<StyledFolder>
+				<StyledIcon className="icon-notebooks"/>{folder ? folder.title : '...'}
+			</StyledFolder>
+		);
+	}
+
+	function renderAddRecipient() {
+		const disabled = shareState !== ShareState.Idle;
+		return (
+			<StyledAddRecipient>
+				<StyledFormLabel>{_('Add recipient:')}</StyledFormLabel>
+				<StyledRecipientControls>
+					<StyledRecipientInput disabled={disabled} type="email" placeholder="example@domain.com" value={recipientEmail} onChange={recipientEmail_change} />
+					<Button disabled={disabled} title={_('Share')} onClick={shareRecipient_click}></Button>
+				</StyledRecipientControls>
+			</StyledAddRecipient>
+		);
+	}
+
+	function renderRecipient(index: number, shareUser: StateShareUser) {
+		const statusToIcon = {
+			[ShareUserStatus.Waiting]: 'fas fa-question',
+			[ShareUserStatus.Rejected]: 'fas fa-times',
+			[ShareUserStatus.Accepted]: 'fas fa-check',
+		};
+
+		const statusToMessage = {
+			[ShareUserStatus.Waiting]: _('Recipient has not yet accepted the invitation'),
+			[ShareUserStatus.Rejected]: _('Recipient has rejected the invitation'),
+			[ShareUserStatus.Accepted]: _('Recipient has accepted the invitation'),
+		};
+
+		return (
+			<StyledRecipient key={shareUser.user.email} index={index}>
+				<StyledRecipientName>{shareUser.user.email}</StyledRecipientName>
+				<StyledRecipientStatusIcon title={statusToMessage[shareUser.status]} className={statusToIcon[shareUser.status]}></StyledRecipientStatusIcon>
+				<Button iconName="far fa-times-circle" onClick={() => recipient_delete({ shareUserId: shareUser.id })}/>
+			</StyledRecipient>
+		);
+	}
+
+	function renderRecipients() {
+		const listItems = shareUsers.map((su: StateShareUser, index: number) => renderRecipient(index, su));
+
+		return (
+			<StyledRecipients>
+				<StyledFormLabel>{_('Recipients:')}</StyledFormLabel>
+				<StyledRecipientList>
+					{listItems}
+				</StyledRecipientList>
+			</StyledRecipients>
+		);
+	}
+
+	function renderError() {
+		if (!latestError) return null;
+
+		return (
+			<StyledError type="error">
+				{latestError.message}
+			</StyledError>
+		);
+	}
+
+	function renderShareState() {
+		if (shareState === ShareState.Idle) return null;
+
+		const messages = {
+			[ShareState.Synchronizing]: _('Synchronizing...'),
+			[ShareState.Creating]: _('Sharing notebook...'),
+		};
+
+		const message = messages[shareState];
+		if (!message) throw new Error(`Unsupported state: ${shareState}`);
+
+		return (
+			<StyledShareState>
+				{message}
+			</StyledShareState>
+		);
+	}
+
+	async function buttonRow_click(event: ClickEvent) {
+		if (event.buttonName === 'unshare') {
+			if (!confirm(_('Unshare this notebook? The recipients will no longer have access to its content.'))) return;
+			await ShareService.instance().unshareFolder(props.folderId);
+			void synchronize();
+		}
+
+		props.onClose();
+	}
+
+	function renderContent() {
+		return (
+			<div>
+				<DialogTitle title={_('Share Notebook')}/>
+				{renderFolder()}
+				{renderAddRecipient()}
+				{renderShareState()}
+				{renderError()}
+				{renderRecipients()}
+				<DialogButtonRow
+					themeId={props.themeId}
+					onClick={buttonRow_click}
+					okButtonShow={false}
+					cancelButtonLabel={_('Close')}
+					customButtons={customButtons}
+				/>
+			</div>
+		);
+	}
+
+	return (
+		<Dialog renderContent={renderContent}/>
+	);
+}
+
+const mapStateToProps = (state: State) => {
+	return {
+		shares: state.shareService.shares,
+		shareUsers: state.shareService.shareUsers,
+	};
+};
+
+export default connect(mapStateToProps)(ShareFolderDialog as any);
--- a/packages/app-desktop/gui/ShareNoteDialog.tsx
+++ b/packages/app-desktop/gui/ShareNoteDialog.tsx
@@ -4,25 +4,27 @@ import JoplinServerApi from '@joplin/lib/JoplinServerApi';
 import { _, _n } from '@joplin/lib/locale';
 import Note from '@joplin/lib/models/Note';
 import Setting from '@joplin/lib/models/Setting';
-import BaseItem from '@joplin/lib/models/BaseItem';
-import SyncTargetJoplinServer from '@joplin/lib/SyncTargetJoplinServer';
-
-const { themeStyle, buildStyle } = require('@joplin/lib/theme');
-const DialogButtonRow = require('./DialogButtonRow.min');
+import DialogButtonRow from './DialogButtonRow';
+import { themeStyle, buildStyle } from '@joplin/lib/theme';
 import { reg } from '@joplin/lib/registry';
+import Dialog from './Dialog';
+import DialogTitle from './DialogTitle';
+import ShareService from '@joplin/lib/services/share/ShareService';
+import { StateShare } from '@joplin/lib/services/share/reducer';
+import { NoteEntity } from '@joplin/lib/services/database/types';
+import Button from './Button/Button';
+import { connect } from 'react-redux';
+import { AppState } from '../app';
 const { clipboard } = require('electron');

-interface ShareNoteDialogProps {
+interface Props {
 	themeId: number;
 	noteIds: Array<string>;
 	onClose: Function;
+	shares: StateShare[];
 }

-interface SharesMap {
-	[key: string]: any;
-}
-
-function styles_(props: ShareNoteDialogProps) {
+function styles_(props: Props) {
 	return buildStyle('ShareNoteDialog', props.themeId, (theme: any) => {
 		return {
 			noteList: {
@@ -60,17 +62,21 @@ function styles_(props: ShareNoteDialogProps) {
 	});
 }

-export default function ShareNoteDialog(props: ShareNoteDialogProps) {
+export function ShareNoteDialog(props: Props) {
 	console.info('Render ShareNoteDialog');

-	const [notes, setNotes] = useState<any[]>([]);
+	const [notes, setNotes] = useState<NoteEntity[]>([]);
 	const [sharesState, setSharesState] = useState<string>('unknown');
-	const [shares, setShares] = useState<SharesMap>({});
+	// const [shares, setShares] = useState<SharesMap>({});

 	const noteCount = notes.length;
 	const theme = themeStyle(props.themeId);
 	const styles = styles_(props);

+	useEffect(() => {
+		void ShareService.instance().refreshShares();
+	}, []);
+
 	useEffect(() => {
 		async function fetchNotes() {
 			const result = [];
@@ -83,26 +89,19 @@ export default function ShareNoteDialog(props: ShareNoteDialogProps) {
 		void fetchNotes();
 	}, [props.noteIds]);

-	const fileApi = async () => {
-		const syncTarget = reg.syncTarget() as SyncTargetJoplinServer;
-		return syncTarget.fileApi();
-	};
-
-	const joplinServerApi = async (): Promise<JoplinServerApi> => {
-		return (await fileApi()).driver().api();
-	};
-
 	const buttonRow_click = () => {
 		props.onClose();
 	};

-	const copyLinksToClipboard = (api: JoplinServerApi, shares: SharesMap) => {
+	const copyLinksToClipboard = (shares: StateShare[]) => {
 		const links = [];
-		for (const n in shares) links.push(api.shareUrl(shares[n]));
+		for (const share of shares) links.push(ShareService.instance().shareUrl(share));
 		clipboard.writeText(links.join('\n'));
 	};

 	const shareLinkButton_click = async () => {
+		const service = ShareService.instance();
+
 		let hasSynced = false;
 		let tryToSync = false;
 		while (true) {
@@ -116,31 +115,22 @@ export default function ShareNoteDialog(props: ShareNoteDialogProps) {

 				setSharesState('creating');

-				const api = await joplinServerApi();
-
-				const newShares = Object.assign({}, shares);
-				let sharedStatusChanged = false;
+				const newShares: StateShare[] = [];

 				for (const note of notes) {
-					const fullPath = (await fileApi()).fullPath(BaseItem.systemPath(note.id));
-					const share = await api.shareFile(fullPath);
-					newShares[note.id] = share;
-
-					const changed = await BaseItem.updateShareStatus(note, true);
-					if (changed) sharedStatusChanged = true;
+					const share = await service.shareNote(note.id);
+					newShares.push(share);
 				}

-				setShares(newShares);
+				setSharesState('synchronizing');
+				await reg.waitForSyncFinishedThenSync();
+				setSharesState('creating');

-				if (sharedStatusChanged) {
-					setSharesState('synchronizing');
-					await reg.waitForSyncFinishedThenSync();
-					setSharesState('creating');
-				}
-
-				copyLinksToClipboard(api, newShares);
+				copyLinksToClipboard(newShares);

 				setSharesState('created');
+
+				await ShareService.instance().refreshShares();
 			} catch (error) {
 				if (error.code === 404 && !hasSynced) {
 					reg.logger().info('ShareNoteDialog: Note does not exist on server - trying to sync it.', error);
@@ -158,34 +148,53 @@ export default function ShareNoteDialog(props: ShareNoteDialogProps) {
 		}
 	};

-	const removeNoteButton_click = (event: any) => {
-		const newNotes = [];
-		for (let i = 0; i < notes.length; i++) {
-			const n = notes[i];
-			if (n.id === event.noteId) continue;
-			newNotes.push(n);
-		}
-		setNotes(newNotes);
+	// const removeNoteButton_click = (event: any) => {
+	// 	const newNotes = [];
+	// 	for (let i = 0; i < notes.length; i++) {
+	// 		const n = notes[i];
+	// 		if (n.id === event.noteId) continue;
+	// 		newNotes.push(n);
+	// 	}
+	// 	setNotes(newNotes);
+	// };
+
+	const unshareNoteButton_click = async (event: any) => {
+		await ShareService.instance().unshareNote(event.noteId);
+		await ShareService.instance().refreshShares();
 	};

-	const renderNote = (note: any) => {
-		const removeButton = notes.length <= 1 ? null : (
-			<button onClick={() => removeNoteButton_click({ noteId: note.id })} style={styles.noteRemoveButton}>
-				<i style={styles.noteRemoveButtonIcon} className={'fa fa-times'}></i>
-			</button>
+	const renderNote = (note: NoteEntity) => {
+		const unshareButton = !props.shares.find(s => s.note_id === note.id) ? null : (
+			<Button tooltip={_('Unshare note')} iconName="fas fa-share-alt" onClick={() => unshareNoteButton_click({ noteId: note.id })}/>
 		);

+		// const removeButton = notes.length <= 1 ? null : (
+		// 	<Button iconName="fa fa-times" onClick={() => removeNoteButton_click({ noteId: note.id })}/>
+		// );
+
+		// const unshareButton = !shares[note.id] ? null : (
+		// 	<button onClick={() => unshareNoteButton_click({ noteId: note.id })} style={styles.noteRemoveButton}>
+		// 		<i style={styles.noteRemoveButtonIcon} className={'fas fa-share-alt'}></i>
+		// 	</button>
+		// );
+
+		// const removeButton = notes.length <= 1 ? null : (
+		// 	<button onClick={() => removeNoteButton_click({ noteId: note.id })} style={styles.noteRemoveButton}>
+		// 		<i style={styles.noteRemoveButtonIcon} className={'fa fa-times'}></i>
+		// 	</button>
+		// );
+
 		return (
 			<div key={note.id} style={styles.note}>
-				<span style={styles.noteTitle}>{note.title}</span>{removeButton}
+				<span style={styles.noteTitle}>{note.title}</span>{unshareButton}
 			</div>
 		);
 	};

 	const renderNoteList = (notes: any) => {
 		const noteComps = [];
-		for (const noteId of Object.keys(notes)) {
-			noteComps.push(renderNote(notes[noteId]));
+		for (const note of notes) {
+			noteComps.push(renderNote(note));
 		}
 		return <div style={styles.noteList}>{noteComps}</div>;
 	};
@@ -202,24 +211,33 @@ export default function ShareNoteDialog(props: ShareNoteDialogProps) {
 		return <div style={theme.textStyle}>{_('Note: When a note is shared, it will no longer be encrypted on the server.')}<hr/></div>;
 	}

-	function renderBetaWarningMessage() {
-		return <div style={theme.textStyle}>{'Sharing notes via Joplin Server is a Beta feature and the API might change later on. What it means is that if you share a note, the link might become invalid after an upgrade, and you will have to share it again.'}</div>;
-	}
-
-	const rootStyle = Object.assign({}, theme.dialogBox);
-	rootStyle.width = '50%';
-
-	return (
-		<div style={theme.dialogModalLayer}>
-			<div style={rootStyle}>
-				<div style={theme.dialogTitle}>{_('Share Notes')}</div>
+	function renderContent() {
+		return (
+			<div>
+				<DialogTitle title={_('Share Notes')}/>
 				{renderNoteList(notes)}
 				<button disabled={['creating', 'synchronizing'].indexOf(sharesState) >= 0} style={styles.copyShareLinkButton} onClick={shareLinkButton_click}>{_n('Copy Shareable Link', 'Copy Shareable Links', noteCount)}</button>
 				<div style={theme.textStyle}>{statusMessage(sharesState)}</div>
 				{renderEncryptionWarningMessage()}
-				{renderBetaWarningMessage()}
-				<DialogButtonRow themeId={props.themeId} onClick={buttonRow_click} okButtonShow={false} cancelButtonLabel={_('Close')}/>
+				<DialogButtonRow
+					themeId={props.themeId}
+					onClick={buttonRow_click}
+					okButtonShow={false}
+					cancelButtonLabel={_('Close')}
+				/>
 			</div>
-		</div>
+		);
+	}
+
+	return (
+		<Dialog renderContent={renderContent}/>
 	);
 }
+
+const mapStateToProps = (state: AppState) => {
+	return {
+		shares: state.shareService.shares.filter(s => !!s.note_id),
+	};
+};
+
+export default connect(mapStateToProps)(ShareNoteDialog as any);
--- a/packages/app-desktop/gui/Sidebar/Sidebar.tsx
+++ b/packages/app-desktop/gui/Sidebar/Sidebar.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { StyledRoot, StyledAddButton, StyledHeader, StyledHeaderIcon, StyledAllNotesIcon, StyledHeaderLabel, StyledListItem, StyledListItemAnchor, StyledExpandLink, StyledNoteCount, StyledSyncReportText, StyledSyncReport, StyledSynchronizeButton } from './styles';
+import { StyledRoot, StyledAddButton, StyledShareIcon, StyledHeader, StyledHeaderIcon, StyledAllNotesIcon, StyledHeaderLabel, StyledListItem, StyledListItemAnchor, StyledExpandLink, StyledNoteCount, StyledSyncReportText, StyledSyncReport, StyledSynchronizeButton } from './styles';
 import { ButtonLevel } from '../Button/Button';
 import CommandService from '@joplin/lib/services/CommandService';
 import InteropService from '@joplin/lib/services/interop/InteropService';
@@ -12,13 +12,16 @@ import { PluginStates, utils as pluginUtils } from '@joplin/lib/services/plugins
 import { MenuItemLocation } from '@joplin/lib/services/plugins/api/types';
 import { AppState } from '../../app';
 import { ModelType } from '@joplin/lib/BaseModel';
-
-const { connect } = require('react-redux');
-const shared = require('@joplin/lib/components/shared/side-menu-shared.js');
 import BaseModel from '@joplin/lib/BaseModel';
 import Folder from '@joplin/lib/models/Folder';
 import Note from '@joplin/lib/models/Note';
 import Tag from '@joplin/lib/models/Tag';
+import Logger from '@joplin/lib/Logger';
+import { FolderEntity } from '@joplin/lib/services/database/types';
+import stateToWhenClauseContext from '../../services/commands/stateToWhenClauseContext';
+import { store } from '@joplin/lib/reducer';
+const { connect } = require('react-redux');
+const shared = require('@joplin/lib/components/shared/side-menu-shared.js');
 const { themeStyle } = require('@joplin/lib/theme');
 const bridge = require('electron').remote.require('./bridge').default;
 const Menu = bridge().Menu;
@@ -26,6 +29,8 @@ const MenuItem = bridge().MenuItem;
 const { substrWithEllipsis } = require('@joplin/lib/string-utils');
 const { ALL_NOTES_FILTER_ID } = require('@joplin/lib/reserved-ids');

+const logger = Logger.create('Sidebar');
+
 interface Props {
 	themeId: number;
 	dispatch: Function;
@@ -70,12 +75,14 @@ function ExpandLink(props: any) {
 }

 function FolderItem(props: any) {
-	const { hasChildren, isExpanded, depth, selected, folderId, folderTitle, anchorRef, noteCount, onFolderDragStart_, onFolderDragOver_, onFolderDrop_, itemContextMenu, folderItem_click, onFolderToggleClick_ } = props;
+	const { hasChildren, isExpanded, parentId, depth, selected, folderId, folderTitle, anchorRef, noteCount, onFolderDragStart_, onFolderDragOver_, onFolderDrop_, itemContextMenu, folderItem_click, onFolderToggleClick_, shareId } = props;

-	const noteCountComp = noteCount ? <StyledNoteCount>{noteCount}</StyledNoteCount> : null;
+	const noteCountComp = noteCount ? <StyledNoteCount className="note-count-label">{noteCount}</StyledNoteCount> : null;
+
+	const shareIcon = shareId && !parentId ? <StyledShareIcon className="fas fa-share-alt"></StyledShareIcon> : null;

 	return (
-		<StyledListItem depth={depth} selected={selected} className={`list-item-container list-item-depth-${depth}`} onDragStart={onFolderDragStart_} onDragOver={onFolderDragOver_} onDrop={onFolderDrop_} draggable={true} data-folder-id={folderId}>
+		<StyledListItem depth={depth} selected={selected} className={`list-item-container list-item-depth-${depth} ${selected ? 'selected' : ''}`} onDragStart={onFolderDragStart_} onDragOver={onFolderDragOver_} onDrop={onFolderDrop_} draggable={true} data-folder-id={folderId}>
 			<ExpandLink themeId={props.themeId} hasChildren={hasChildren} folderId={folderId} onClick={onFolderToggleClick_} isExpanded={isExpanded}/>
 			<StyledListItemAnchor
 				ref={anchorRef}
@@ -83,6 +90,7 @@ function FolderItem(props: any) {
 				isConflictFolder={folderId === Folder.conflictFolderId()}
 				href="#"
 				selected={selected}
+				shareId={shareId}
 				data-id={folderId}
 				data-type={BaseModel.TYPE_FOLDER}
 				onContextMenu={itemContextMenu}
@@ -92,7 +100,8 @@ function FolderItem(props: any) {
 				}}
 				onDoubleClick={onFolderToggleClick_}
 			>
-				{folderTitle} {noteCountComp}
+				<span className="title">{folderTitle}</span>
+				{shareIcon} {noteCountComp}
 			</StyledListItemAnchor>
 		</StyledListItem>
 	);
@@ -158,22 +167,27 @@ class SidebarComponent extends React.Component<Props, State> {
 		// to put the dropped folder at the root. But for notes, folderId needs to always be defined
 		// since there's no such thing as a root note.

-		if (dt.types.indexOf('text/x-jop-note-ids') >= 0) {
-			event.preventDefault();
+		try {
+			if (dt.types.indexOf('text/x-jop-note-ids') >= 0) {
+				event.preventDefault();

-			if (!folderId) return;
+				if (!folderId) return;

-			const noteIds = JSON.parse(dt.getData('text/x-jop-note-ids'));
-			for (let i = 0; i < noteIds.length; i++) {
-				await Note.moveToFolder(noteIds[i], folderId);
-			}
-		} else if (dt.types.indexOf('text/x-jop-folder-ids') >= 0) {
-			event.preventDefault();
-
-			const folderIds = JSON.parse(dt.getData('text/x-jop-folder-ids'));
-			for (let i = 0; i < folderIds.length; i++) {
-				await Folder.moveToFolder(folderIds[i], folderId);
+				const noteIds = JSON.parse(dt.getData('text/x-jop-note-ids'));
+				for (let i = 0; i < noteIds.length; i++) {
+					await Note.moveToFolder(noteIds[i], folderId);
+				}
+			} else if (dt.types.indexOf('text/x-jop-folder-ids') >= 0) {
+				event.preventDefault();
+
+				const folderIds = JSON.parse(dt.getData('text/x-jop-folder-ids'));
+				for (let i = 0; i < folderIds.length; i++) {
+					await Folder.moveToFolder(folderIds[i], folderId);
+				}
 			}
+		} catch (error) {
+			logger.error(error);
+			alert(error.message);
 		}
 	}

@@ -222,12 +236,14 @@ class SidebarComponent extends React.Component<Props, State> {
 		const itemType = Number(event.currentTarget.getAttribute('data-type'));
 		if (!itemId || !itemType) throw new Error('No data on element');

+		const state: AppState = store().getState();
+
 		let deleteMessage = '';
-		let buttonLabel = _('Remove');
+		let deleteButtonLabel = _('Remove');
 		if (itemType === BaseModel.TYPE_FOLDER) {
 			const folder = await Folder.load(itemId);
 			deleteMessage = _('Delete notebook "%s"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.', substrWithEllipsis(folder.title, 0, 32));
-			buttonLabel = _('Delete');
+			deleteButtonLabel = _('Delete');
 		} else if (itemType === BaseModel.TYPE_TAG) {
 			const tag = await Tag.load(itemId);
 			deleteMessage = _('Remove tag "%s" from all notes?', substrWithEllipsis(tag.title, 0, 32));
@@ -250,10 +266,10 @@ class SidebarComponent extends React.Component<Props, State> {

 		menu.append(
 			new MenuItem({
-				label: buttonLabel,
+				label: deleteButtonLabel,
 				click: async () => {
 					const ok = bridge().showConfirmMessageBox(deleteMessage, {
-						buttons: [buttonLabel, _('Cancel')],
+						buttons: [deleteButtonLabel, _('Cancel')],
 						defaultId: 1,
 					});
 					if (!ok) return;
@@ -294,6 +310,14 @@ class SidebarComponent extends React.Component<Props, State> {
 				);
 			}

+			// We don't display the "Share notebook" menu item for sub-notebooks
+			// that are within a shared notebook. If user wants to do this,
+			// they'd have to move the notebook out of the shared notebook
+			// first.
+			if (CommandService.instance().isEnabled('showShareFolderDialog', stateToWhenClauseContext(state, { commandFolderId: itemId }))) {
+				menu.append(new MenuItem(menuUtils.commandToStatefulMenuItem('showShareFolderDialog', itemId)));
+			}
+
 			menu.append(
 				new MenuItem({
 					label: _('Export'),
@@ -359,7 +383,7 @@ class SidebarComponent extends React.Component<Props, State> {
 	}

 	renderNoteCount(count: number) {
-		return count ? <StyledNoteCount>{count}</StyledNoteCount> : null;
+		return count ? <StyledNoteCount className="note-count-label">{count}</StyledNoteCount> : null;
 	}

 	renderExpandIcon(isExpanded: boolean, isVisible: boolean = true) {
@@ -371,7 +395,7 @@ class SidebarComponent extends React.Component<Props, State> {

 	renderAllNotesItem(selected: boolean) {
 		return (
-			<StyledListItem key="allNotesHeader" selected={selected} className={'list-item-container list-item-depth-0'} isSpecialItem={true}>
+			<StyledListItem key="allNotesHeader" selected={selected} className={'list-item-container list-item-depth-0 all-notes'} isSpecialItem={true}>
 				<StyledExpandLink>{this.renderExpandIcon(false, false)}</StyledExpandLink>
 				<StyledAllNotesIcon className="icon-notes"/>
 				<StyledListItemAnchor
@@ -387,10 +411,10 @@ class SidebarComponent extends React.Component<Props, State> {
 		);
 	}

-	renderFolderItem(folder: any, selected: boolean, hasChildren: boolean, depth: number) {
+	renderFolderItem(folder: FolderEntity, selected: boolean, hasChildren: boolean, depth: number) {
 		const anchorRef = this.anchorItemRef('folder', folder.id);
 		const isExpanded = this.props.collapsedFolderIds.indexOf(folder.id) < 0;
-		let noteCount = folder.note_count;
+		let noteCount = (folder as any).note_count;

 		// Thunderbird count: Subtract children note_count from parent folder if it expanded.
 		if (isExpanded) {
@@ -418,6 +442,8 @@ class SidebarComponent extends React.Component<Props, State> {
 			itemContextMenu={this.itemContextMenu}
 			folderItem_click={this.folderItem_click}
 			onFolderToggleClick_={this.onFolderToggleClick_}
+			shareId={folder.share_id}
+			parentId={folder.parent_id}
 		/>;
 	}

@@ -426,7 +452,12 @@ class SidebarComponent extends React.Component<Props, State> {
 		const noteCount = Setting.value('showNoteCounts') ? this.renderNoteCount(tag.note_count) : '';

 		return (
-			<StyledListItem selected={selected} className={'list-item-container'} key={tag.id} onDrop={this.onTagDrop_} data-tag-id={tag.id}>
+			<StyledListItem selected={selected}
+				className={`list-item-container ${selected ? 'selected' : ''}`}
+				key={tag.id}
+				onDrop={this.onTagDrop_}
+				data-tag-id={tag.id}
+			>
 				<StyledExpandLink>{this.renderExpandIcon(false, false)}</StyledExpandLink>
 				<StyledListItemAnchor
 					ref={anchorRef}
@@ -440,7 +471,8 @@ class SidebarComponent extends React.Component<Props, State> {
 						this.tagItem_click(tag);
 					}}
 				>
-					{Tag.displayTitle(tag)} {noteCount}
+					<span className="tag-label">{Tag.displayTitle(tag)}</span>
+					{noteCount}
 				</StyledListItemAnchor>
 			</StyledListItem>
 		);
@@ -632,7 +664,11 @@ class SidebarComponent extends React.Component<Props, State> {
 			const folderItems = [this.renderAllNotesItem(allNotesSelected)].concat(result.items);
 			this.folderItemsOrder_ = result.order;
 			items.push(
-				<div className="folders" key="folder_items" style={{ display: this.state.folderHeaderIsExpanded ? 'block' : 'none', paddingBottom: 10 }}>
+				<div
+					className={`folders ${this.state.folderHeaderIsExpanded ? 'expanded' : ''}`}
+					key="folder_items"
+					style={{ display: this.state.folderHeaderIsExpanded ? 'block' : 'none', paddingBottom: 10 }}
+				>
 					{folderItems}
 				</div>
 			);
--- a/packages/app-desktop/gui/Sidebar/styles/index.ts
+++ b/packages/app-desktop/gui/Sidebar/styles/index.ts
@@ -63,16 +63,16 @@ export const StyledListItem = styled.div`
 function listItemTextColor(props: any) {
 	if (props.isConflictFolder) return props.theme.colorError2;
 	if (props.isSpecialItem) return props.theme.colorFaded2;
+	if (props.shareId) return props.theme.colorWarn2;
 	return props.theme.color2;
 }

 export const StyledListItemAnchor = styled.a`
 	font-size: ${(props: any) => Math.round(props.theme.fontSize * 1.0833333)}px;
-	// font-weight: 500;
 	text-decoration: none;
 	color: ${(props: any) => listItemTextColor(props)};
 	cursor: default;
-	opacity: ${(props: any) => props.selected ? 1 : 0.8};
+	opacity: ${(props: any) => props.selected || props.shareId ? 1 : 0.8};
 	white-space: nowrap;
 	display: flex;
 	flex: 1;
@@ -81,6 +81,10 @@ export const StyledListItemAnchor = styled.a`
 	height: 100%;
 `;

+export const StyledShareIcon = styled.i`
+	margin-left: 8px;
+`;
+
 export const StyledExpandLink = styled.a`
 	color: ${(props: any) => props.theme.color2};
 	cursor: default;
--- a/packages/app-desktop/gui/StatusScreen/StatusScreen.tsx
+++ b/packages/app-desktop/gui/StatusScreen/StatusScreen.tsx
@@ -87,12 +87,15 @@ function StatusScreen(props: Props) {

 		itemsHtml.push(renderSectionTitleHtml(section.title, section.title));

+		let currentListKey = '';
+		let listItems: any[] = [];
 		for (const n in section.body) {
 			if (!section.body.hasOwnProperty(n)) continue;
 			const item = section.body[n];
 			let text = '';

 			let retryLink = null;
+			let itemType = null;
 			if (typeof item === 'object') {
 				if (item.canRetry) {
 					const onClick = async () => {
@@ -107,18 +110,40 @@ function StatusScreen(props: Props) {
 					);
 				}
 				text = item.text;
+				itemType = item.type;
 			} else {
 				text = item;
 			}

+			if (itemType === 'openList') {
+				currentListKey = item.key;
+				continue;
+			}
+
+			if (itemType === 'closeList') {
+				itemsHtml.push(<ul key={currentListKey}>{listItems}</ul>);
+				currentListKey = '';
+				listItems = [];
+				continue;
+			}
+
 			if (!text) text = '\xa0';

-			itemsHtml.push(
-				<div style={theme.textStyle} key={`item_${n}`}>
-					<span>{text}</span>
-					{retryLink}
-				</div>
-			);
+			if (currentListKey) {
+				listItems.push(
+					<li style={theme.textStyle} key={`item_${n}`}>
+						<span>{text}</span>
+						{retryLink}
+					</li>
+				);
+			} else {
+				itemsHtml.push(
+					<div style={theme.textStyle} key={`item_${n}`}>
+						<span>{text}</span>
+						{retryLink}
+					</div>
+				);
+			}
 		}

 		if (section.canRetryAll) {
--- a/packages/app-desktop/gui/ToggleEditorsButton/ToggleEditorsButton.tsx
+++ b/packages/app-desktop/gui/ToggleEditorsButton/ToggleEditorsButton.tsx
@@ -17,7 +17,16 @@ export default function ToggleEditorsButton(props: Props) {
 	const style = styles_(props);

 	return (
-		<button style={style.button} disabled={!props.toolbarButtonInfo.enabled} aria-label={props.toolbarButtonInfo.tooltip} title={props.toolbarButtonInfo.tooltip} type="button" className="tox-tbtn" aria-pressed="false" onClick={props.toolbarButtonInfo.onClick}>
+		<button
+			style={style.button}
+			disabled={!props.toolbarButtonInfo.enabled}
+			aria-label={props.toolbarButtonInfo.tooltip}
+			title={props.toolbarButtonInfo.tooltip}
+			type="button"
+			className={`tox-tbtn ${props.value}-active`}
+			aria-pressed="false"
+			onClick={props.toolbarButtonInfo.onClick}
+		>
 			<div style={style.leftInnerButton}>
 				<i style={style.leftIcon} className="fab fa-markdown"></i>
 			</div>
--- a/packages/app-desktop/gui/menuCommandNames.ts
+++ b/packages/app-desktop/gui/menuCommandNames.ts
@@ -45,5 +45,7 @@ export default function() {
 		'editor.swapLineUp',
 		'editor.swapLineDown',
 		'toggleSafeMode',
+		'showShareNoteDialog',
+		'showShareFolderDialog',
 	];
 }
--- a/packages/app-desktop/gui/style/StyledFormLabel.tsx
+++ b/packages/app-desktop/gui/style/StyledFormLabel.tsx
@@ -0,0 +1,11 @@
+import styled from 'styled-components';
+
+const StyledFormLabel = styled.div`
+	font-size: ${props => props.theme.fontSize * 1.083333}px;
+	color: ${props => props.theme.color};
+	font-family: ${props => props.theme.fontFamily};
+	font-weight: 500;
+	margin-bottom: ${props => props.theme.mainPadding / 2}px;
+`;
+
+export default StyledFormLabel;
--- a/packages/app-desktop/gui/style/StyledLink.tsx
+++ b/packages/app-desktop/gui/style/StyledLink.tsx
@@ -0,0 +1,9 @@
+import styled from 'styled-components';
+
+const StyledLink = styled.a`
+	font-size: ${props => props.theme.fontSize}px;
+	color: ${props => props.theme.urlColor};
+	font-family: ${props => props.theme.fontFamily};
+`;
+
+export default StyledLink;
--- a/packages/app-desktop/gui/style/StyledMessage.tsx
+++ b/packages/app-desktop/gui/style/StyledMessage.tsx
@@ -0,0 +1,13 @@
+import styled from 'styled-components';
+
+const StyledMessage = styled.div`
+	border-radius: 3px;
+	background-color: ${props => props.type === 'error' ? props.theme.warningBackgroundColor : 'transparent'};
+	font-size: ${props => props.theme.fontSize}px;
+	color: ${props => props.theme.color};
+	font-family: ${props => props.theme.fontFamily};
+	padding: ${props => props.type === 'error' ? props.theme.mainPadding : '0'}px;
+	word-break: break-all;
+`;
+
+export default StyledMessage;
--- a/packages/app-desktop/gui/utils/NoteListUtils.ts
+++ b/packages/app-desktop/gui/utils/NoteListUtils.ts
@@ -22,6 +22,7 @@ interface ContextMenuProps {
 	watchedNoteFiles: string[];
 	plugins: PluginStates;
 	inConflictFolder: boolean;
+	customCss: string;
 }

 export default class NoteListUtils {
@@ -158,6 +159,7 @@ export default class NoteListUtils {
 								sourceNoteIds: noteIds,
 								includeConflicts: props.inConflictFolder,
 								plugins: props.plugins,
+								customCss: props.customCss,
 							});
 						},
 					})
--- a/packages/app-desktop/package-lock.json
+++ b/packages/app-desktop/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/app-desktop",
-  "version": "1.8.4",
+  "version": "2.0.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -3199,7 +3199,7 @@
            },
            "ini": {
              "version": "1.3.5",
-              "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+              "resolved": false,
              "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
              "dev": true,
              "optional": true
@@ -7659,7 +7659,7 @@
            },
            "ini": {
              "version": "1.3.5",
-              "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+              "resolved": false,
              "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
              "dev": true,
              "optional": true
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Cozic	cfe4546a0b	Server v2.0.3	2021-05-25 20:09:18 +02:00
Laurent Cozic	f45e0d106f	Merge branch 'dev' into release-2.0	2021-05-25 20:05:29 +02:00
Laurent Cozic	12a66342db	Server: Fixed handling of request origin	2021-05-25 20:04:54 +02:00
Laurent Cozic	f2b17560e6	Fixed tests	2021-05-25 19:18:33 +02:00
Laurent Cozic	ba30dce6c8	server-v2.0.2	2021-05-25 19:17:42 +02:00
Laurent Cozic	f5984313be	package lock	2021-05-25 18:11:49 +02:00
Laurent Cozic	df058352a5	Merge branch 'dev' into release-2.0	2021-05-25 17:51:55 +02:00
Laurent Cozic	cde25fad92	Fixed tests and server build	2021-05-25 17:50:51 +02:00
Laurent Cozic	d89bbc5571	Merge branch 'dev' into release-2.0	2021-05-25 17:23:43 +02:00
Laurent Cozic	71a7fc015a	Server: Use external directory to store Postgres data in Docker-compose config	2021-05-25 17:20:22 +02:00
Laurent Cozic	83cef7a824	Server: Allow using a different domain for API, main website and user content	2021-05-25 16:42:21 +02:00
Laurent Cozic	f65de0c9eb	Merge branch 'dev' into release-2.0	2021-05-25 13:07:29 +02:00
Laurent Cozic	3edf74e6d2	Merge branch 'release-2.0' into dev	2021-05-25 13:06:36 +02:00
Laurent Cozic	b01aa7eb45	Server: Make it more difficult to delete all data	2021-05-25 12:33:19 +02:00
Laurent Cozic	e59e3aa7d1	Server: Defaults to enabling share when creating user from admin UI	2021-05-25 12:25:26 +02:00
Laurent Cozic	51051e0ee0	Server: Redirect to correct page when trying to access the root	2021-05-25 12:21:35 +02:00
Laurent Cozic	b20ab19f13	Desktop: Rename Joplin Server to Joplin Cloud in UI	2021-05-25 12:16:57 +02:00
Laurent Cozic	68e79f1573	Server: Allow setting the path to the SQLite database using SQLITE_DATABASE env variable	2021-05-25 12:13:35 +02:00
Laurent Cozic	ed8ee67048	Server: Add mailer service	2021-05-25 11:49:47 +02:00
Laurent Cozic	68b516998d	Update website	2021-05-24 01:16:43 +02:00
Laurent Cozic	0fa7a66fb6	Doc: Android doc title	2021-05-24 01:16:21 +02:00
Laurent Cozic	13f39b9bd5	Update website	2021-05-24 01:15:21 +02:00
albertopasqualetto	013d37bd09	All: Translation: Update it_IT.po (#5003 )	2021-05-23 16:36:02 -04:00
mbalint	4760e5e8ba	Desktop: Fixes #4864 : Fixes panels overflowing window (#4991 )	2021-05-22 18:30:11 +01:00
Laurent Cozic	8930dac40e	Desktop release v2.0.2	2021-05-21 17:45:13 +02:00
Laurent Cozic	3f0586ef63	Desktop: Displays error info when Joplin Server fails	2021-05-21 17:42:32 +02:00
Laurent Cozic	e94503abbe	Tools: Fixed tests	2021-05-21 17:02:56 +02:00
Laurent Cozic	f8253cc2f0	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-05-21 15:17:51 +02:00
Laurent Cozic	2806aa1b19	Tools: Moved lib-specific tests under lib package	2021-05-21 15:17:21 +02:00
小骏	8f57e07279	All: Translation: Update zh_CN.po (#4993 )	2021-05-21 00:48:05 -04:00
Laurent Cozic	6ff560f22f	Desktop: Fixes #4591 : Prevent cursor from jumping to top of page when pasting image	2021-05-20 19:13:35 +02:00
Laurent Cozic	2226b79c46	Desktop: Fixed pasting HTML in Rich Text editor, and improved pasting plain text	2021-05-20 18:08:59 +02:00
Laurent Cozic	9e9bf63d70	Desktop: Regression: Pasting plain text in Rich Text editor was broken	2021-05-20 17:42:04 +02:00
Breno Baptista	5d9419be5d	Doc: Improved Linux notifications instruction (#4985 )	2021-05-19 22:27:43 +01:00
Roman Musin	9f37aa96c6	Android: Fixes #4912 , Fixes #4086 , Fixes #4908 : Fixed and improved alarm notifications (#4984 )	2021-05-19 22:26:42 +01:00
JackGruber	eceb14ff9e	Desktop: Resolves #4433 : Import linked local files when importing Markdown files (#4966 )	2021-05-19 22:22:03 +01:00
Laurent Cozic	85211e8d5c	Mobile: Fixes #4494 : Fixed opening URLs that contain non-alphabetical characters	2021-05-19 16:48:55 +02:00
Laurent Cozic	bd08041f53	Desktop: Pass custom CSS property to all export handlers and renderers	2021-05-19 15:00:16 +02:00
Laurent Cozic	77b284f01f	Server: Added API end points to manage users	2021-05-18 17:11:50 +02:00
Laurent Cozic	daaaa133ab	Server: Allow enabling or disabling the sharing feature per user	2021-05-18 15:53:56 +02:00
Laurent Cozic	e6c4eb7cdf	Server: Renamed users.item_max_size => users.max_item_size	2021-05-18 15:11:03 +02:00
tatsu	dc2cdb7d3a	Doc: Fixed json of s3 bucket policy (#4981 )	2021-05-17 15:15:23 -04:00
Andre Jilderda	f3e03d48bb	Desktop: Add classnames to DOM elements for theming purposes (#4933 )	2021-05-17 19:33:44 +01:00
Laurent Cozic	6577f4f35d	Desktop: Regression: It was no longer possible to add list items in an empty note	2021-05-17 20:30:48 +02:00
Laurent Cozic	d29624c816	Desktop: Handle too large items for Joplin Server	2021-05-17 18:55:39 +02:00
Laurent Cozic	6afde54bda	Server: Add support for item size limit	2021-05-17 18:35:01 +02:00
Laurent Cozic	ec7f0f479a	Server: Improved log table too and made it sortable	2021-05-17 17:29:21 +02:00
Laurent Cozic	7f05420fda	Server: Improved Items table and added item size to it	2021-05-17 17:02:15 +02:00
Laurent Cozic	a3f8cd4850	Merge branch 'release-2.0' into dev	2021-05-16 19:40:08 +02:00
Laurent Cozic	01ccf5170a	Tools: Changelog for Android version	2021-05-16 19:38:36 +02:00
Laurent Cozic	6ddb69e1ea	Server: Fixed bug when unsharing a notebook that has no recipients	2021-05-16 18:55:07 +02:00
Laurent Cozic	b01f82bb33	Android release v2.0.1	2021-05-16 17:54:13 +02:00
Laurent Cozic	b6c9edba21	Tools: Make sure branch has been pushed before releasing Android version	2021-05-16 17:50:50 +02:00
Laurent Cozic	f7d164be6e	Desktop: Allow unsharing a note	2021-05-16 17:28:49 +02:00
Laurent Cozic	6f2f24171d	Desktop: Add Share Notebook menu item	2021-05-16 15:21:55 +02:00
Laurent Cozic	12cc64008b	typo	2021-05-16 12:49:05 +02:00
Laurent Cozic	b9955f58d3	Server: Refactor ShareType	2021-05-16 12:46:58 +02:00
Laurent Cozic	489995daef	Server: Fixed deleting a note that has been shared	2021-05-16 12:42:58 +02:00
Laurent Cozic	e156ee1b58	Server: Generate only one share link per note	2021-05-16 12:33:36 +02:00
Laurent Cozic	a24b0091ad	Server: Go back to home page when there is an error and user is logged in	2021-05-16 12:19:18 +02:00
Laurent Cozic	2655b6deee	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-05-16 11:48:15 +02:00
Laurent Cozic	45c40f7395	Server: Fixed log page	2021-05-16 11:46:16 +02:00
Woosuk Park	ecb0eee355	All: Translation: Update ko.po (#4976 ) * Some Translated. and some modified * ko.po Update	2021-05-16 02:39:43 -04:00
suixinio	4916f4cc92	All: Translation: Update zh_CN.po (#4969 ) This PR updates zh_CN.po, with just a minor translation fix.	2021-05-15 15:58:48 -04:00
Laurent Cozic	15fe119256	Desktop: Made sync more reliable by making it skip items that time out, and improved sync status screen	2021-05-15 20:56:49 +02:00
Laurent Cozic	0b46880a00	Desktop: Fixes #4926 : Fixed issue with empty panels being created by plugins	2021-05-15 17:30:56 +02:00
Laurent Cozic	deaa731983	Update translations	2021-05-15 16:15:55 +02:00
Laurent Cozic	d061bb1a4f	typo	2021-05-15 16:06:24 +02:00
Laurent Cozic	03db0c5486	Desktop: Resolves #4462 : Improved usability when plugin repository cannot be connected to	2021-05-15 16:04:10 +02:00
Laurent Cozic	bb275e671d	Tools: Allow running the test units with Postgres	2021-05-15 15:13:08 +02:00
Laurent Cozic	2d0580ff71	Server: Fixed /items page when using Postgres	2021-05-15 15:10:40 +02:00
Laurent Cozic	2331d3487b	Desktop, Cli: Resolves #4968 : Import SVG as images when importing ENEX files	2021-05-15 13:42:57 +02:00
Laurent Cozic	f1380fd51d	Server: Fixes #4540 : Make sure temp files are deleted after upload is done	2021-05-15 12:13:46 +02:00
Laurent Cozic	d462dab8eb	Update French translation	2021-05-15 11:36:52 +02:00
Laurent Cozic	cf37b74d9a	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-05-15 11:14:40 +02:00
Laurent Cozic	aec3ea9c0c	Desktop, Cli: Fixes #4965 : Improved importing Evernote notes that contain codeblocks	2021-05-15 11:12:11 +02:00
Helmut K. C. Tessarek	1f5aa70acd	Update translations (for new server/client code)	2021-05-14 13:27:17 -04:00
Harris Arvanitis	416637ce83	All: Translation: Update el_GR.po (#4961 )	2021-05-14 13:23:13 -04:00
Gen Neko	99c4b0bc01	All: Translation: Update ja_JP.po (#4960 )	2021-05-14 13:22:35 -04:00
Laurent Cozic	74d8fec98a	Desktop release v2.0.1	2021-05-14 17:17:40 +02:00
Laurent Cozic	321a58c356	Prepare for v2	2021-05-14 17:17:02 +02:00
Laurent Cozic	81884cf2ea	add comment	2021-05-14 14:52:29 +02:00
Laurent Cozic	d7ff634f5e	Merge branch 'release-1.8' into dev	2021-05-14 14:50:04 +02:00
Laurent Cozic	a965da97b6	ios-v10.8.1	2021-05-14 14:43:49 +02:00
Laurent Cozic	b99cb0248d	Cli: Fixes #4845 : Fixed possible crash when trying to delete corrupted revision in revision service	2021-05-14 12:09:20 +02:00
Laurent Cozic	a31b402b9e	Desktop: Added button to skip an application update And made auto-updates enabled by default	2021-05-14 11:29:06 +02:00
Laurent Cozic	6959f14a3f	Desktop: Fixes #4958 : Display proper error message when JEX file is corrupted	2021-05-13 22:13:53 +02:00
Laurent	0765cf5955	All: Add support for sharing notebooks with Joplin Server (#4772 ) - Joplin Server: Adds support for sharing a notebook - Desktop: Adds support for sharing a notebook with Joplin Server - Mobile: Adds support for reading and writing to a shared notebook (not possible to share a notebook) - Cli: Adds support for reading and writing to a shared notebook (not possible to share a notebook)	2021-05-13 17:57:37 +01:00
JackGruber	09ad70983a	Desktop: Fix #4581 : Show or hide completed todos in search results based on user settings (#4951 )	2021-05-13 13:23:17 +01:00
Helmut K. C. Tessarek	6e64b872cf	Update translations	2021-05-13 05:34:25 -04:00
Helmut K. C. Tessarek	d26b92500c	All: Translation: Update da_DK.po (thanks ERYpTION)	2021-05-13 05:29:16 -04:00
Helmut K. C. Tessarek	fc9aa33dbb	Update readme downloads	2021-05-13 05:23:54 -04:00
Helmut K. C. Tessarek	a286dbdf86	update website	2021-05-13 05:17:36 -04:00
Helmut K. C. Tessarek	c3f2bce818	fix a few typos and grammar	2021-05-13 05:11:10 -04:00
Subhra264	df6f0ce9af	Desktop: Fixes #4891 : Solve "Resource Id not provided" error (#4943 )	2021-05-13 09:34:03 +01:00
JackGruber	5f2998a6e2	Doc: Add sync status to FAQ (#4953 )	2021-05-13 08:56:31 +01:00
Helmut K. C. Tessarek	fa6981faa8	All: Add new date format YYMMDD (#4954 )	2021-05-13 08:55:41 +01:00
JackGruber	ce80d7e883	Generator: Fixed issue with handling of CRLF in ignore file (#4956 )	2021-05-13 08:54:27 +01:00
Laurent Cozic	1a84ca204e	Merge branch 'release-1.8' into dev	2021-05-11 15:05:01 +02:00
Edvin Saletovic	0d523e5394	All: Translation: Update bs_BA.po (#4942 )	2021-05-10 16:27:31 -04:00
Laurent Cozic	b28f087bbe	Desktop release v1.8.5	2021-05-10 12:33:18 +02:00
Laurent Cozic	ea536dbf87	Merge branch 'release-1.8' into dev	2021-05-10 12:23:39 +02:00
Laurent Cozic	ed19424271	Plugin Generator release v1.8.1	2021-05-10 12:23:14 +02:00
Laurent Cozic	5d7a3ceff5	Doc: Fixed deploy doc	2021-05-10 12:22:56 +02:00
Laurent Cozic	610e1dc885	Doc: Add info on how to deploy each app	2021-05-10 12:21:55 +02:00
Laurent Cozic	10bb689d5f	Merge branch 'release-1.8' into dev	2021-05-09 20:07:40 +02:00
Woosuk Park	99410005a6	All: Translation: Update ko.po (#4930 )	2021-05-08 15:07:47 -04:00
				`@@ -0,0 +1 @@`
				<div><div>code block:</div><div><br/></div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, 'Courier New', monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>public static void main(String[] args) {</div><div><span>    System.out.println('Hello World');</span><br/></div><div>}</div></div><div><br/></div><div>end of code block</div></div>