Publish

- joplin@2.2.2
 - @joplin/app-clipper@1.0.9
 - @joplin/app-desktop@2.2.7
 - @joplin/app-mobile@0.8.10
 - @joplin/fork-htmlparser2@4.1.31
 - @joplin/fork-sax@1.2.35
 - generator-joplin@2.2.2
 - @joplin/lib@2.2.3
 - @joplin/plugin-repo-cli@2.2.3
 - @joplin/plugins@0.0.1
 - @joplin/renderer@2.2.3
 - @joplin/server@2.2.12
 - @joplin/tools@2.2.3
 - @joplin/turndown-plugin-gfm@1.0.35
 - @joplin/turndown@4.0.53

.dockerignore

@@ -7,6 +7,4 @@ packages/app-cli
 packages/app-mobile
 packages/app-clipper
 packages/generator-joplin
-packages/plugin-repo-cli
-packages/server/db-*.sqlite
-packages/server/temp
+packages/plugin-repo-cli

.eslintignore

@@ -3,15 +3,22 @@ _releases/
 .git/
 .github/
 *.min.js
-**/commands/index.ts
 **/node_modules/
 Assets/
 docs/
+packages/plugins/**/dist
+packages/plugins/**/api
+packages/server/dist/
 highlight.pack.js
 Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/JoplinLists/
 Modules/TinyMCE/langs/
+packages/turndown/
+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
@@ -40,31 +47,21 @@ packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/supportedLocales.js
 packages/app-desktop/locales
 packages/app-desktop/node_modules
 packages/app-desktop/packageInfo.js
-packages/app-desktop/services/electron-context-menu.js
 packages/app-mobile/android
-packages/app-mobile/components/NoteEditor/CodeMirror.bundle.js
 packages/app-mobile/ios
-packages/app-mobile/lib/rnInjectedJs/
 packages/app-mobile/locales
 packages/app-mobile/node_modules
 packages/app-mobile/pluginAssets/
-packages/fork-*
-packages/htmlpack/dist/
+packages/app-mobile/lib/rnInjectedJs/
+packages/app-mobile/components/NoteEditor/CodeMirror.bundle.js
 packages/lib/assets/
-packages/lib/lib/lib.js
-packages/lib/locales/index.js
 packages/lib/rnInjectedJs/
-packages/lib/services/database/types.ts
 packages/lib/vendor/
 packages/lib/vendor/fountain.min.js
 packages/lib/welcomeAssets.js
-packages/plugins/**/api
-packages/plugins/**/dist
-packages/server/dist/
 packages/tools/node_modules
 packages/tools/PortableAppsLauncher
-packages/turndown-plugin-gfm/
-packages/turndown/
+packages/fork-*
 plugin_types/
 readme/
 
@@ -78,12 +75,6 @@ packages/app-cli/app/command-e2ee.js.map
 packages/app-cli/app/command-settingschema.d.ts
 packages/app-cli/app/command-settingschema.js
 packages/app-cli/app/command-settingschema.js.map
-packages/app-cli/app/command-sync.d.ts
-packages/app-cli/app/command-sync.js
-packages/app-cli/app/command-sync.js.map
-packages/app-cli/app/command-testing.d.ts
-packages/app-cli/app/command-testing.js
-packages/app-cli/app/command-testing.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
@@ -93,6 +84,9 @@ packages/app-cli/tests/HtmlToMd.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/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
@@ -117,9 +111,6 @@ packages/app-cli/tests/services/plugins/sandboxProxy.js.map
 packages/app-cli/tests/testUtils.d.ts
 packages/app-cli/tests/testUtils.js
 packages/app-cli/tests/testUtils.js.map
-packages/app-cli/tools/populateDatabase.d.ts
-packages/app-cli/tools/populateDatabase.js
-packages/app-cli/tools/populateDatabase.js.map
 packages/app-desktop/ElectronAppWrapper.d.ts
 packages/app-desktop/ElectronAppWrapper.js
 packages/app-desktop/ElectronAppWrapper.js.map
@@ -129,12 +120,6 @@ packages/app-desktop/InteropServiceHelper.js.map
 packages/app-desktop/app.d.ts
 packages/app-desktop/app.js
 packages/app-desktop/app.js.map
-packages/app-desktop/app.reducer.d.ts
-packages/app-desktop/app.reducer.js
-packages/app-desktop/app.reducer.js.map
-packages/app-desktop/app.reducer.test.d.ts
-packages/app-desktop/app.reducer.test.js
-packages/app-desktop/app.reducer.test.js.map
 packages/app-desktop/bridge.d.ts
 packages/app-desktop/bridge.js
 packages/app-desktop/bridge.js.map
@@ -153,9 +138,6 @@ packages/app-desktop/commands/exportNotes.js.map
 packages/app-desktop/commands/focusElement.d.ts
 packages/app-desktop/commands/focusElement.js
 packages/app-desktop/commands/focusElement.js.map
-packages/app-desktop/commands/index.d.ts
-packages/app-desktop/commands/index.js
-packages/app-desktop/commands/index.js.map
 packages/app-desktop/commands/openProfileDirectory.d.ts
 packages/app-desktop/commands/openProfileDirectory.js
 packages/app-desktop/commands/openProfileDirectory.js.map
@@ -219,15 +201,9 @@ 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
-packages/app-desktop/gui/EditFolderDialog/Dialog.d.ts
-packages/app-desktop/gui/EditFolderDialog/Dialog.js
-packages/app-desktop/gui/EditFolderDialog/Dialog.js.map
-packages/app-desktop/gui/EditFolderDialog/IconSelector.d.ts
-packages/app-desktop/gui/EditFolderDialog/IconSelector.js
-packages/app-desktop/gui/EditFolderDialog/IconSelector.js.map
-packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.d.ts
-packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js
-packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js.map
+packages/app-desktop/gui/EncryptionConfigScreen.d.ts
+packages/app-desktop/gui/EncryptionConfigScreen.js
+packages/app-desktop/gui/EncryptionConfigScreen.js.map
 packages/app-desktop/gui/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
@@ -252,9 +228,6 @@ packages/app-desktop/gui/KeymapConfig/utils/useKeymap.js.map
 packages/app-desktop/gui/MainScreen/MainScreen.d.ts
 packages/app-desktop/gui/MainScreen/MainScreen.js
 packages/app-desktop/gui/MainScreen/MainScreen.js.map
-packages/app-desktop/gui/MainScreen/commands/commandPalette.d.ts
-packages/app-desktop/gui/MainScreen/commands/commandPalette.js
-packages/app-desktop/gui/MainScreen/commands/commandPalette.js.map
 packages/app-desktop/gui/MainScreen/commands/editAlarm.d.ts
 packages/app-desktop/gui/MainScreen/commands/editAlarm.js
 packages/app-desktop/gui/MainScreen/commands/editAlarm.js.map
@@ -267,12 +240,6 @@ packages/app-desktop/gui/MainScreen/commands/gotoAnything.js.map
 packages/app-desktop/gui/MainScreen/commands/hideModalMessage.d.ts
 packages/app-desktop/gui/MainScreen/commands/hideModalMessage.js
 packages/app-desktop/gui/MainScreen/commands/hideModalMessage.js.map
-packages/app-desktop/gui/MainScreen/commands/index.d.ts
-packages/app-desktop/gui/MainScreen/commands/index.js
-packages/app-desktop/gui/MainScreen/commands/index.js.map
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.d.ts
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.js
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.js.map
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.js
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.js.map
@@ -291,9 +258,6 @@ packages/app-desktop/gui/MainScreen/commands/newTodo.js.map
 packages/app-desktop/gui/MainScreen/commands/openFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/openFolder.js
 packages/app-desktop/gui/MainScreen/commands/openFolder.js.map
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.d.ts
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js.map
 packages/app-desktop/gui/MainScreen/commands/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
@@ -345,24 +309,12 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.d.ts
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js.map
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.d.ts
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js.map
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.d.ts
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js
 packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js.map
-packages/app-desktop/gui/MasterPasswordDialog/Dialog.d.ts
-packages/app-desktop/gui/MasterPasswordDialog/Dialog.js
-packages/app-desktop/gui/MasterPasswordDialog/Dialog.js.map
 packages/app-desktop/gui/MenuBar.d.ts
 packages/app-desktop/gui/MenuBar.js
 packages/app-desktop/gui/MenuBar.js.map
@@ -417,9 +369,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js.map
@@ -447,24 +396,21 @@ packages/app-desktop/gui/NoteEditor/NoteEditor.js.map
 packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.d.ts
 packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.js
 packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.js.map
+packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.d.ts
+packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.js
+packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.js.map
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.d.ts
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.js
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.js.map
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.d.ts
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.js
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.js.map
-packages/app-desktop/gui/NoteEditor/commands/index.d.ts
-packages/app-desktop/gui/NoteEditor/commands/index.js
-packages/app-desktop/gui/NoteEditor/commands/index.js.map
 packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.d.ts
 packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.js
 packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.js.map
 packages/app-desktop/gui/NoteEditor/commands/showRevisions.d.ts
 packages/app-desktop/gui/NoteEditor/commands/showRevisions.js
 packages/app-desktop/gui/NoteEditor/commands/showRevisions.js.map
-packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.d.ts
-packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.js
-packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.js.map
 packages/app-desktop/gui/NoteEditor/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/styles/index.js
 packages/app-desktop/gui/NoteEditor/styles/index.js.map
@@ -519,18 +465,12 @@ packages/app-desktop/gui/NoteList/NoteList.js.map
 packages/app-desktop/gui/NoteList/commands/focusElementNoteList.d.ts
 packages/app-desktop/gui/NoteList/commands/focusElementNoteList.js
 packages/app-desktop/gui/NoteList/commands/focusElementNoteList.js.map
-packages/app-desktop/gui/NoteList/commands/index.d.ts
-packages/app-desktop/gui/NoteList/commands/index.js
-packages/app-desktop/gui/NoteList/commands/index.js.map
 packages/app-desktop/gui/NoteListControls/NoteListControls.d.ts
 packages/app-desktop/gui/NoteListControls/NoteListControls.js
 packages/app-desktop/gui/NoteListControls/NoteListControls.js.map
 packages/app-desktop/gui/NoteListControls/commands/focusSearch.d.ts
 packages/app-desktop/gui/NoteListControls/commands/focusSearch.js
 packages/app-desktop/gui/NoteListControls/commands/focusSearch.js.map
-packages/app-desktop/gui/NoteListControls/commands/index.d.ts
-packages/app-desktop/gui/NoteListControls/commands/index.js
-packages/app-desktop/gui/NoteListControls/commands/index.js.map
 packages/app-desktop/gui/NoteListItem.d.ts
 packages/app-desktop/gui/NoteListItem.js
 packages/app-desktop/gui/NoteListItem.js.map
@@ -546,9 +486,6 @@ packages/app-desktop/gui/NoteToolbar/NoteToolbar.js.map
 packages/app-desktop/gui/OneDriveLoginScreen.d.ts
 packages/app-desktop/gui/OneDriveLoginScreen.js
 packages/app-desktop/gui/OneDriveLoginScreen.js.map
-packages/app-desktop/gui/PasswordInput/PasswordInput.d.ts
-packages/app-desktop/gui/PasswordInput/PasswordInput.js
-packages/app-desktop/gui/PasswordInput/PasswordInput.js.map
 packages/app-desktop/gui/ResizableLayout/MoveButtons.d.ts
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js.map
@@ -630,21 +567,12 @@ packages/app-desktop/gui/Sidebar/Sidebar.js.map
 packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.d.ts
 packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js
 packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js.map
-packages/app-desktop/gui/Sidebar/commands/index.d.ts
-packages/app-desktop/gui/Sidebar/commands/index.js
-packages/app-desktop/gui/Sidebar/commands/index.js.map
 packages/app-desktop/gui/Sidebar/styles/index.d.ts
 packages/app-desktop/gui/Sidebar/styles/index.js
 packages/app-desktop/gui/Sidebar/styles/index.js.map
 packages/app-desktop/gui/StatusScreen/StatusScreen.d.ts
 packages/app-desktop/gui/StatusScreen/StatusScreen.js
 packages/app-desktop/gui/StatusScreen/StatusScreen.js.map
-packages/app-desktop/gui/StyleSheets/StyleSheetContainer.d.ts
-packages/app-desktop/gui/StyleSheets/StyleSheetContainer.js
-packages/app-desktop/gui/StyleSheets/StyleSheetContainer.js.map
-packages/app-desktop/gui/SyncWizard/Dialog.d.ts
-packages/app-desktop/gui/SyncWizard/Dialog.js
-packages/app-desktop/gui/SyncWizard/Dialog.js.map
 packages/app-desktop/gui/TagList.d.ts
 packages/app-desktop/gui/TagList.js
 packages/app-desktop/gui/TagList.js.map
@@ -708,9 +636,6 @@ packages/app-desktop/gui/utils/NoteListUtils.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
-packages/app-desktop/gui/utils/loadScript.d.ts
-packages/app-desktop/gui/utils/loadScript.js
-packages/app-desktop/gui/utils/loadScript.js.map
 packages/app-desktop/plugins/GotoAnything.d.ts
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/plugins/GotoAnything.js.map
@@ -759,21 +684,6 @@ packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
-packages/app-desktop/services/share/invitationRespond.d.ts
-packages/app-desktop/services/share/invitationRespond.js
-packages/app-desktop/services/share/invitationRespond.js.map
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.d.ts
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js.map
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.d.ts
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js.map
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.d.ts
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.js
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.js.map
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.d.ts
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -831,9 +741,6 @@ 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/services/e2ee/RSA.react-native.d.ts
-packages/app-mobile/services/e2ee/RSA.react-native.js
-packages/app-mobile/services/e2ee/RSA.react-native.js.map
 packages/app-mobile/setupQuickActions.d.ts
 packages/app-mobile/setupQuickActions.js
 packages/app-mobile/setupQuickActions.js.map
@@ -912,9 +819,6 @@ packages/generator-joplin/generators/app/templates/api_index.js.map
 packages/generator-joplin/generators/app/templates/src/index.d.ts
 packages/generator-joplin/generators/app/templates/src/index.js
 packages/generator-joplin/generators/app/templates/src/index.js.map
-packages/htmlpack/src/index.d.ts
-packages/htmlpack/src/index.js
-packages/htmlpack/src/index.js.map
 packages/lib/AsyncActionQueue.d.ts
 packages/lib/AsyncActionQueue.js
 packages/lib/AsyncActionQueue.js.map
@@ -954,9 +858,6 @@ packages/lib/JoplinServerApi.js.map
 packages/lib/Logger.d.ts
 packages/lib/Logger.js
 packages/lib/Logger.js.map
-packages/lib/ObjectUtils.d.ts
-packages/lib/ObjectUtils.js
-packages/lib/ObjectUtils.js.map
 packages/lib/PoorManIntervals.d.ts
 packages/lib/PoorManIntervals.js
 packages/lib/PoorManIntervals.js.map
@@ -966,15 +867,9 @@ packages/lib/SyncTargetJoplinCloud.js.map
 packages/lib/SyncTargetJoplinServer.d.ts
 packages/lib/SyncTargetJoplinServer.js
 packages/lib/SyncTargetJoplinServer.js.map
-packages/lib/SyncTargetNone.d.ts
-packages/lib/SyncTargetNone.js
-packages/lib/SyncTargetNone.js.map
 packages/lib/SyncTargetOneDrive.d.ts
 packages/lib/SyncTargetOneDrive.js
 packages/lib/SyncTargetOneDrive.js.map
-packages/lib/SyncTargetRegistry.d.ts
-packages/lib/SyncTargetRegistry.js
-packages/lib/SyncTargetRegistry.js.map
 packages/lib/Synchronizer.d.ts
 packages/lib/Synchronizer.js
 packages/lib/Synchronizer.js.map
@@ -984,33 +879,18 @@ packages/lib/TaskQueue.js.map
 packages/lib/array.d.ts
 packages/lib/array.js
 packages/lib/array.js.map
-packages/lib/callbackUrlUtils.d.ts
-packages/lib/callbackUrlUtils.js
-packages/lib/callbackUrlUtils.js.map
-packages/lib/callbackUrlUtils.test.d.ts
-packages/lib/callbackUrlUtils.test.js
-packages/lib/callbackUrlUtils.test.js.map
 packages/lib/commands/historyBackward.d.ts
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyBackward.js.map
 packages/lib/commands/historyForward.d.ts
 packages/lib/commands/historyForward.js
 packages/lib/commands/historyForward.js.map
-packages/lib/commands/index.d.ts
-packages/lib/commands/index.js
-packages/lib/commands/index.js.map
-packages/lib/commands/openMasterPasswordDialog.d.ts
-packages/lib/commands/openMasterPasswordDialog.js
-packages/lib/commands/openMasterPasswordDialog.js.map
 packages/lib/commands/synchronize.d.ts
 packages/lib/commands/synchronize.js
 packages/lib/commands/synchronize.js.map
-packages/lib/components/EncryptionConfigScreen/utils.d.ts
-packages/lib/components/EncryptionConfigScreen/utils.js
-packages/lib/components/EncryptionConfigScreen/utils.js.map
-packages/lib/database-driver-better-sqlite.d.ts
-packages/lib/database-driver-better-sqlite.js
-packages/lib/database-driver-better-sqlite.js.map
+packages/lib/components/shared/encryption-config-shared.d.ts
+packages/lib/components/shared/encryption-config-shared.js
+packages/lib/components/shared/encryption-config-shared.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1047,15 +927,6 @@ 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/hooks/useAsyncEffect.d.ts
-packages/lib/hooks/useAsyncEffect.js
-packages/lib/hooks/useAsyncEffect.js.map
-packages/lib/hooks/useElementSize.d.ts
-packages/lib/hooks/useElementSize.js
-packages/lib/hooks/useElementSize.js.map
-packages/lib/hooks/useEventListener.d.ts
-packages/lib/hooks/useEventListener.js
-packages/lib/hooks/useEventListener.js.map
 packages/lib/htmlUtils.d.ts
 packages/lib/htmlUtils.js
 packages/lib/htmlUtils.js.map
@@ -1071,9 +942,6 @@ 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/import-enex.d.ts
-packages/lib/import-enex.js
-packages/lib/import-enex.js.map
 packages/lib/locale.d.ts
 packages/lib/locale.js
 packages/lib/locale.js.map
@@ -1107,15 +975,9 @@ packages/lib/models/Folder.test.js.map
 packages/lib/models/ItemChange.d.ts
 packages/lib/models/ItemChange.js
 packages/lib/models/ItemChange.js.map
-packages/lib/models/ItemChange.test.d.ts
-packages/lib/models/ItemChange.test.js
-packages/lib/models/ItemChange.test.js.map
 packages/lib/models/MasterKey.d.ts
 packages/lib/models/MasterKey.js
 packages/lib/models/MasterKey.js.map
-packages/lib/models/MasterKey.test.d.ts
-packages/lib/models/MasterKey.test.js
-packages/lib/models/MasterKey.test.js.map
 packages/lib/models/Migration.d.ts
 packages/lib/models/Migration.js
 packages/lib/models/Migration.js.map
@@ -1176,12 +1038,9 @@ packages/lib/models/utils/paginationToSql.js.map
 packages/lib/models/utils/types.d.ts
 packages/lib/models/utils/types.js
 packages/lib/models/utils/types.js.map
-packages/lib/net-utils.d.ts
-packages/lib/net-utils.js
-packages/lib/net-utils.js.map
-packages/lib/ntp.d.ts
-packages/lib/ntp.js
-packages/lib/ntp.js.map
+packages/lib/ntpDate.d.ts
+packages/lib/ntpDate.js
+packages/lib/ntpDate.js.map
 packages/lib/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1215,6 +1074,12 @@ packages/lib/services/CommandService.test.js.map
 packages/lib/services/DecryptionWorker.d.ts
 packages/lib/services/DecryptionWorker.js
 packages/lib/services/DecryptionWorker.js.map
+packages/lib/services/EncryptionService.d.ts
+packages/lib/services/EncryptionService.js
+packages/lib/services/EncryptionService.js.map
+packages/lib/services/EncryptionService.test.d.ts
+packages/lib/services/EncryptionService.test.js
+packages/lib/services/EncryptionService.test.js.map
 packages/lib/services/ExternalEditWatcher.d.ts
 packages/lib/services/ExternalEditWatcher.js
 packages/lib/services/ExternalEditWatcher.js.map
@@ -1308,33 +1173,6 @@ packages/lib/services/database/types.js.map
 packages/lib/services/debug/populateDatabase.d.ts
 packages/lib/services/debug/populateDatabase.js
 packages/lib/services/debug/populateDatabase.js.map
-packages/lib/services/e2ee/EncryptionService.d.ts
-packages/lib/services/e2ee/EncryptionService.js
-packages/lib/services/e2ee/EncryptionService.js.map
-packages/lib/services/e2ee/EncryptionService.test.d.ts
-packages/lib/services/e2ee/EncryptionService.test.js
-packages/lib/services/e2ee/EncryptionService.test.js.map
-packages/lib/services/e2ee/RSA.node.d.ts
-packages/lib/services/e2ee/RSA.node.js
-packages/lib/services/e2ee/RSA.node.js.map
-packages/lib/services/e2ee/ppk.d.ts
-packages/lib/services/e2ee/ppk.js
-packages/lib/services/e2ee/ppk.js.map
-packages/lib/services/e2ee/ppk.test.d.ts
-packages/lib/services/e2ee/ppk.test.js
-packages/lib/services/e2ee/ppk.test.js.map
-packages/lib/services/e2ee/ppkTestUtils.d.ts
-packages/lib/services/e2ee/ppkTestUtils.js
-packages/lib/services/e2ee/ppkTestUtils.js.map
-packages/lib/services/e2ee/types.d.ts
-packages/lib/services/e2ee/types.js
-packages/lib/services/e2ee/types.js.map
-packages/lib/services/e2ee/utils.d.ts
-packages/lib/services/e2ee/utils.js
-packages/lib/services/e2ee/utils.js.map
-packages/lib/services/e2ee/utils.test.d.ts
-packages/lib/services/e2ee/utils.test.js
-packages/lib/services/e2ee/utils.test.js.map
 packages/lib/services/interop/InteropService.d.ts
 packages/lib/services/interop/InteropService.js
 packages/lib/services/interop/InteropService.js.map
@@ -1359,15 +1197,6 @@ packages/lib/services/interop/InteropService_Exporter_Jex.js.map
 packages/lib/services/interop/InteropService_Exporter_Md.d.ts
 packages/lib/services/interop/InteropService_Exporter_Md.js
 packages/lib/services/interop/InteropService_Exporter_Md.js.map
-packages/lib/services/interop/InteropService_Exporter_Md.test.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md.test.js
-packages/lib/services/interop/InteropService_Exporter_Md.test.js.map
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js.map
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Raw.d.ts
 packages/lib/services/interop/InteropService_Exporter_Raw.js
 packages/lib/services/interop/InteropService_Exporter_Raw.js.map
@@ -1389,15 +1218,6 @@ packages/lib/services/interop/InteropService_Importer_Jex.js.map
 packages/lib/services/interop/InteropService_Importer_Md.d.ts
 packages/lib/services/interop/InteropService_Importer_Md.js
 packages/lib/services/interop/InteropService_Importer_Md.js.map
-packages/lib/services/interop/InteropService_Importer_Md.test.d.ts
-packages/lib/services/interop/InteropService_Importer_Md.test.js
-packages/lib/services/interop/InteropService_Importer_Md.test.js.map
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.d.ts
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js.map
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.d.ts
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js.map
 packages/lib/services/interop/InteropService_Importer_Raw.d.ts
 packages/lib/services/interop/InteropService_Importer_Raw.js
 packages/lib/services/interop/InteropService_Importer_Raw.js.map
@@ -1554,12 +1374,6 @@ packages/lib/services/rest/actionApi.desktop.js.map
 packages/lib/services/rest/routes/auth.d.ts
 packages/lib/services/rest/routes/auth.js
 packages/lib/services/rest/routes/auth.js.map
-packages/lib/services/rest/routes/events.d.ts
-packages/lib/services/rest/routes/events.js
-packages/lib/services/rest/routes/events.js.map
-packages/lib/services/rest/routes/events.test.d.ts
-packages/lib/services/rest/routes/events.test.js
-packages/lib/services/rest/routes/events.test.js.map
 packages/lib/services/rest/routes/folders.d.ts
 packages/lib/services/rest/routes/folders.js
 packages/lib/services/rest/routes/folders.js.map
@@ -1641,21 +1455,6 @@ packages/lib/services/spellChecker/SpellCheckerService.js.map
 packages/lib/services/spellChecker/SpellCheckerServiceDriverBase.d.ts
 packages/lib/services/spellChecker/SpellCheckerServiceDriverBase.js
 packages/lib/services/spellChecker/SpellCheckerServiceDriverBase.js.map
-packages/lib/services/style/cssToTheme.d.ts
-packages/lib/services/style/cssToTheme.js
-packages/lib/services/style/cssToTheme.js.map
-packages/lib/services/style/cssToTheme.test.d.ts
-packages/lib/services/style/cssToTheme.test.js
-packages/lib/services/style/cssToTheme.test.js.map
-packages/lib/services/style/loadCssToTheme.d.ts
-packages/lib/services/style/loadCssToTheme.js
-packages/lib/services/style/loadCssToTheme.js.map
-packages/lib/services/style/themeToCss.d.ts
-packages/lib/services/style/themeToCss.js
-packages/lib/services/style/themeToCss.js.map
-packages/lib/services/style/themeToCss.test.d.ts
-packages/lib/services/style/themeToCss.test.js
-packages/lib/services/style/themeToCss.test.js.map
 packages/lib/services/synchronizer/ItemUploader.d.ts
 packages/lib/services/synchronizer/ItemUploader.js
 packages/lib/services/synchronizer/ItemUploader.js.map
@@ -1677,9 +1476,6 @@ 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.ppk.test.d.ts
-packages/lib/services/synchronizer/Synchronizer.ppk.test.js
-packages/lib/services/synchronizer/Synchronizer.ppk.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
@@ -1704,18 +1500,6 @@ 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/migrations/3.d.ts
-packages/lib/services/synchronizer/migrations/3.js
-packages/lib/services/synchronizer/migrations/3.js.map
-packages/lib/services/synchronizer/syncDebugLog.d.ts
-packages/lib/services/synchronizer/syncDebugLog.js
-packages/lib/services/synchronizer/syncDebugLog.js.map
-packages/lib/services/synchronizer/syncInfoUtils.d.ts
-packages/lib/services/synchronizer/syncInfoUtils.js
-packages/lib/services/synchronizer/syncInfoUtils.js.map
-packages/lib/services/synchronizer/syncInfoUtils.test.d.ts
-packages/lib/services/synchronizer/syncInfoUtils.test.js
-packages/lib/services/synchronizer/syncInfoUtils.test.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
@@ -1812,12 +1596,6 @@ packages/plugin-repo-cli/lib/gitCompareUrl.js.map
 packages/plugin-repo-cli/lib/gitCompareUrl.test.d.ts
 packages/plugin-repo-cli/lib/gitCompareUrl.test.js
 packages/plugin-repo-cli/lib/gitCompareUrl.test.js.map
-packages/plugin-repo-cli/lib/overrideUtils.d.ts
-packages/plugin-repo-cli/lib/overrideUtils.js
-packages/plugin-repo-cli/lib/overrideUtils.js.map
-packages/plugin-repo-cli/lib/overrideUtils.test.d.ts
-packages/plugin-repo-cli/lib/overrideUtils.test.js
-packages/plugin-repo-cli/lib/overrideUtils.test.js.map
 packages/plugin-repo-cli/lib/types.d.ts
 packages/plugin-repo-cli/lib/types.js
 packages/plugin-repo-cli/lib/types.js.map
@@ -1827,9 +1605,6 @@ packages/plugin-repo-cli/lib/updateReadme.js.map
 packages/plugin-repo-cli/lib/updateReadme.test.d.ts
 packages/plugin-repo-cli/lib/updateReadme.test.js
 packages/plugin-repo-cli/lib/updateReadme.test.js.map
-packages/plugin-repo-cli/lib/utils.d.ts
-packages/plugin-repo-cli/lib/utils.js
-packages/plugin-repo-cli/lib/utils.js.map
 packages/plugins/ToggleSidebars/api/index.d.ts
 packages/plugins/ToggleSidebars/api/index.js
 packages/plugins/ToggleSidebars/api/index.js.map
@@ -1896,18 +1671,12 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
-packages/renderer/MdToHtml/rules/source_map.d.ts
-packages/renderer/MdToHtml/rules/source_map.js
-packages/renderer/MdToHtml/rules/source_map.js.map
 packages/renderer/MdToHtml/setupLinkify.d.ts
 packages/renderer/MdToHtml/setupLinkify.js
 packages/renderer/MdToHtml/setupLinkify.js.map
 packages/renderer/MdToHtml/validateLinks.d.ts
 packages/renderer/MdToHtml/validateLinks.js
 packages/renderer/MdToHtml/validateLinks.js.map
-packages/renderer/headerAnchor.d.ts
-packages/renderer/headerAnchor.js
-packages/renderer/headerAnchor.js.map
 packages/renderer/htmlUtils.d.ts
 packages/renderer/htmlUtils.js
 packages/renderer/htmlUtils.js.map
@@ -1926,21 +1695,12 @@ packages/renderer/utils.js.map
 packages/tools/buildServerDocker.d.ts
 packages/tools/buildServerDocker.js
 packages/tools/buildServerDocker.js.map
-packages/tools/buildServerDocker.test.d.ts
-packages/tools/buildServerDocker.test.js
-packages/tools/buildServerDocker.test.js.map
-packages/tools/convertThemesToCss.d.ts
-packages/tools/convertThemesToCss.js
-packages/tools/convertThemesToCss.js.map
 packages/tools/generate-database-types.d.ts
 packages/tools/generate-database-types.js
 packages/tools/generate-database-types.js.map
 packages/tools/generate-images.d.ts
 packages/tools/generate-images.js
 packages/tools/generate-images.js.map
-packages/tools/git-changelog.d.ts
-packages/tools/git-changelog.js
-packages/tools/git-changelog.js.map
 packages/tools/lerna-add.d.ts
 packages/tools/lerna-add.js
 packages/tools/lerna-add.js.map
@@ -1959,33 +1719,15 @@ packages/tools/release-ios.js.map
 packages/tools/release-server.d.ts
 packages/tools/release-server.js
 packages/tools/release-server.js.map
-packages/tools/setupNewRelease.d.ts
-packages/tools/setupNewRelease.js
-packages/tools/setupNewRelease.js.map
-packages/tools/tagServerLatest.d.ts
-packages/tools/tagServerLatest.js
-packages/tools/tagServerLatest.js.map
 packages/tools/tool-utils.d.ts
 packages/tools/tool-utils.js
 packages/tools/tool-utils.js.map
-packages/tools/update-readme-download.d.ts
-packages/tools/update-readme-download.js
-packages/tools/update-readme-download.js.map
 packages/tools/update-readme-sponsors.d.ts
 packages/tools/update-readme-sponsors.js
 packages/tools/update-readme-sponsors.js.map
-packages/tools/updateMarkdownDoc.d.ts
-packages/tools/updateMarkdownDoc.js
-packages/tools/updateMarkdownDoc.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
-packages/tools/website/updateDownloadPage.d.ts
-packages/tools/website/updateDownloadPage.js
-packages/tools/website/updateDownloadPage.js.map
-packages/tools/website/utils/frontMatter.d.ts
-packages/tools/website/utils/frontMatter.js
-packages/tools/website/utils/frontMatter.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map

.eslintrc.js

@@ -171,55 +171,6 @@ module.exports = {
 					},
 				}],
 				'@typescript-eslint/no-floating-promises': ['error'],
-				'@typescript-eslint/naming-convention': ['error',
-					// Naming conventions over the codebase is very inconsistent
-					// unfortunately and fixing it would be way too much work.
-					// In general, we use "strictCamelCase" for variable names.
-
-					// {
-					// 	selector: 'default',
-					// 	format: ['StrictPascalCase', 'strictCamelCase', 'snake_case', 'UPPER_CASE'],
-					// 	leadingUnderscore: 'allow',
-					// 	trailingUnderscore: 'allow',
-					// },
-
-					// Each rule below is made of two blocks: first the rule we
-					// actually want, and below exceptions to the rule.
-
-					// -----------------------------------
-					// ENUM
-					// -----------------------------------
-
-					{
-						selector: 'enumMember',
-						format: ['StrictPascalCase'],
-					},
-					{
-						selector: 'enumMember',
-						format: null,
-						'filter': {
-							'regex': '^(GET|POST|PUT|DELETE|PATCH|HEAD|SQLite|PostgreSQL|ASC|DESC|E2EE|OR|AND|UNION|INTERSECT|EXCLUSION|INCLUSION|EUR|GBP|USD|SJCL.*)$',
-							'match': true,
-						},
-					},
-
-					// -----------------------------------
-					// INTERFACE
-					// -----------------------------------
-
-					{
-						selector: 'interface',
-						format: ['StrictPascalCase'],
-					},
-					{
-						selector: 'interface',
-						format: null,
-						'filter': {
-							'regex': '^(RSA|RSAKeyPair)$',
-							'match': true,
-						},
-					},
-				],
 			},
 		},
 	],

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,8 +9,7 @@ assignees: ''
 
 <!--
   Please provide a clear and concise description of what the bug is. (In the section Steps To Reproduce.)
-  Include screenshots for UI problems if needed.
-  DO NOT create screenshots of text !!! Copy and paste the text into a code block.
+  Include screenshots if needed.
   Please test using the latest Joplin release to make sure your issue has not already been fixed.
 -->
 

.github/scripts/run_ci.sh

@@ -62,22 +62,6 @@ npm install
 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running tests..."
 
-	# On Linux, we run the Joplin Server tests using PostgreSQL
-	if [ "$IS_LINUX" == "1" ]; then
-		echo "Running Joplin Server tests using PostgreSQL..."
-		sudo docker-compose --file docker-compose.db-dev.yml up -d
-		export JOPLIN_TESTS_SERVER_DB=pg
-	else
-		echo "Running Joplin Server tests using SQLite..."
-	fi
-
-	# Need this because we're getting this error:
-	#
-	# @joplin/lib: FATAL ERROR: Ineffective mark-compacts near heap limit
-	# Allocation failed - JavaScript heap out of memory
-	#
-	# https://stackoverflow.com/questions/38558989
-	export NODE_OPTIONS="--max-old-space-size=4096"
 	npm run test-ci
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
@@ -90,7 +74,7 @@ fi
 # release randomly fail.
 # =============================================================================
 
-if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
+if [ "$IS_PULL_REQUEST" == "1" ]; then
 	echo "Step: Running linter..."
 
 	npm run linter-ci ./
@@ -118,27 +102,6 @@ if [ "$IS_PULL_REQUEST" == "1" ]; then
 	fi
 fi
 
-# =============================================================================
-# Check that we didn't lose any string due to gettext not being able to parse
-# newly modified or added scripts. This is convenient to quickly view on GitHub
-# what commit may have broken translation building. We run this on macOS because
-# we need the latest version of gettext (and stable Ubuntu doesn't have it).
-# =============================================================================
-
-if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
-	if [ "$IS_MACOS" == "1" ]; then
-		echo "Step: Checking for lost translation strings..."
-
-		xgettext --version
-
-		node packages/tools/build-translation.js --missing-strings-check-only
-		testResult=$?
-		if [ $testResult -ne 0 ]; then
-			exit $testResult
-		fi
-	fi
-fi
-
 # =============================================================================
 # Find out if we should run the build or not. Electron-builder gets stuck when
 # building PRs so we disable it in this case. The Linux build should provide
@@ -154,12 +117,13 @@ if [ "$IS_PULL_REQUEST" == "1" ]; then
 fi
 
 # =============================================================================
-# Build the Electron app or Docker image depending on the current tag.
+# Prepare the Electron app and build it
 #
 # If the current tag is a desktop release tag (starts with "v", such as
-# "v1.4.7"), we build and publish to GitHub. Otherwise we only build but don't
-# publish to GitHub. It helps finding out any issue in pull requests and dev
-# branch.
+# "v1.4.7"), we build and publish to github
+#
+# Otherwise we only build but don't publish to GitHub. It helps finding
+# out any issue in pull requests and dev branch.
 # =============================================================================
 
 cd "$ROOT_DIR/packages/app-desktop"
@@ -170,7 +134,7 @@ if [[ $GIT_TAG_NAME = v* ]]; then
 elif [[ $GIT_TAG_NAME = server-v* ]] && [[ $IS_LINUX = 1 ]]; then
 	echo "Step: Building Docker Image..."
 	cd "$ROOT_DIR"
-	npm run buildServerDocker -- --tag-name $GIT_TAG_NAME --push-images
+	npm run buildServerDocker -- --tag-name $GIT_TAG_NAME
 else
 	echo "Step: Building but *not* publishing desktop application..."
 	USE_HARD_LINKS=false npm run dist -- --publish=never

.github/workflows/github-actions-main.yml

@@ -19,18 +19,9 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y gettext
           sudo apt-get install -y libsecret-1-dev
-          sudo apt-get install -y translate-toolkit
-
-      - name: Install macOS dependencies
-        if: runner.os == 'macOS'
-        run: |
-          brew update
-          brew install gettext
-          brew install translate-toolkit
 
       - name: Install Docker Engine
-        # if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
         run: |
           sudo apt-get install -y apt-transport-https
           sudo apt-get install -y ca-certificates
@@ -48,7 +39,7 @@ jobs:
       - uses: olegtarasov/get-tag@v2.1
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '12'
       
       # Login to Docker only if we're on a server release tag. If we run this on
       # a pull request it will fail because the PR doesn't have access to

.gitignore

@@ -49,7 +49,6 @@ packages/tools/commit_hook.txt
 packages/tools/github_oauth_token.txt
 lerna-debug.log
 .env
-docs/**/*.mustache
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.d.ts
@@ -61,12 +60,6 @@ packages/app-cli/app/command-e2ee.js.map
 packages/app-cli/app/command-settingschema.d.ts
 packages/app-cli/app/command-settingschema.js
 packages/app-cli/app/command-settingschema.js.map
-packages/app-cli/app/command-sync.d.ts
-packages/app-cli/app/command-sync.js
-packages/app-cli/app/command-sync.js.map
-packages/app-cli/app/command-testing.d.ts
-packages/app-cli/app/command-testing.js
-packages/app-cli/app/command-testing.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
@@ -76,6 +69,9 @@ packages/app-cli/tests/HtmlToMd.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/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
@@ -100,9 +96,6 @@ packages/app-cli/tests/services/plugins/sandboxProxy.js.map
 packages/app-cli/tests/testUtils.d.ts
 packages/app-cli/tests/testUtils.js
 packages/app-cli/tests/testUtils.js.map
-packages/app-cli/tools/populateDatabase.d.ts
-packages/app-cli/tools/populateDatabase.js
-packages/app-cli/tools/populateDatabase.js.map
 packages/app-desktop/ElectronAppWrapper.d.ts
 packages/app-desktop/ElectronAppWrapper.js
 packages/app-desktop/ElectronAppWrapper.js.map
@@ -112,12 +105,6 @@ packages/app-desktop/InteropServiceHelper.js.map
 packages/app-desktop/app.d.ts
 packages/app-desktop/app.js
 packages/app-desktop/app.js.map
-packages/app-desktop/app.reducer.d.ts
-packages/app-desktop/app.reducer.js
-packages/app-desktop/app.reducer.js.map
-packages/app-desktop/app.reducer.test.d.ts
-packages/app-desktop/app.reducer.test.js
-packages/app-desktop/app.reducer.test.js.map
 packages/app-desktop/bridge.d.ts
 packages/app-desktop/bridge.js
 packages/app-desktop/bridge.js.map
@@ -136,9 +123,6 @@ packages/app-desktop/commands/exportNotes.js.map
 packages/app-desktop/commands/focusElement.d.ts
 packages/app-desktop/commands/focusElement.js
 packages/app-desktop/commands/focusElement.js.map
-packages/app-desktop/commands/index.d.ts
-packages/app-desktop/commands/index.js
-packages/app-desktop/commands/index.js.map
 packages/app-desktop/commands/openProfileDirectory.d.ts
 packages/app-desktop/commands/openProfileDirectory.js
 packages/app-desktop/commands/openProfileDirectory.js.map
@@ -202,15 +186,9 @@ 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
-packages/app-desktop/gui/EditFolderDialog/Dialog.d.ts
-packages/app-desktop/gui/EditFolderDialog/Dialog.js
-packages/app-desktop/gui/EditFolderDialog/Dialog.js.map
-packages/app-desktop/gui/EditFolderDialog/IconSelector.d.ts
-packages/app-desktop/gui/EditFolderDialog/IconSelector.js
-packages/app-desktop/gui/EditFolderDialog/IconSelector.js.map
-packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.d.ts
-packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js
-packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.js.map
+packages/app-desktop/gui/EncryptionConfigScreen.d.ts
+packages/app-desktop/gui/EncryptionConfigScreen.js
+packages/app-desktop/gui/EncryptionConfigScreen.js.map
 packages/app-desktop/gui/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
@@ -235,9 +213,6 @@ packages/app-desktop/gui/KeymapConfig/utils/useKeymap.js.map
 packages/app-desktop/gui/MainScreen/MainScreen.d.ts
 packages/app-desktop/gui/MainScreen/MainScreen.js
 packages/app-desktop/gui/MainScreen/MainScreen.js.map
-packages/app-desktop/gui/MainScreen/commands/commandPalette.d.ts
-packages/app-desktop/gui/MainScreen/commands/commandPalette.js
-packages/app-desktop/gui/MainScreen/commands/commandPalette.js.map
 packages/app-desktop/gui/MainScreen/commands/editAlarm.d.ts
 packages/app-desktop/gui/MainScreen/commands/editAlarm.js
 packages/app-desktop/gui/MainScreen/commands/editAlarm.js.map
@@ -250,12 +225,6 @@ packages/app-desktop/gui/MainScreen/commands/gotoAnything.js.map
 packages/app-desktop/gui/MainScreen/commands/hideModalMessage.d.ts
 packages/app-desktop/gui/MainScreen/commands/hideModalMessage.js
 packages/app-desktop/gui/MainScreen/commands/hideModalMessage.js.map
-packages/app-desktop/gui/MainScreen/commands/index.d.ts
-packages/app-desktop/gui/MainScreen/commands/index.js
-packages/app-desktop/gui/MainScreen/commands/index.js.map
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.d.ts
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.js
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.js.map
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.js
 packages/app-desktop/gui/MainScreen/commands/moveToFolder.js.map
@@ -274,9 +243,6 @@ packages/app-desktop/gui/MainScreen/commands/newTodo.js.map
 packages/app-desktop/gui/MainScreen/commands/openFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/openFolder.js
 packages/app-desktop/gui/MainScreen/commands/openFolder.js.map
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.d.ts
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js.map
 packages/app-desktop/gui/MainScreen/commands/openNote.d.ts
 packages/app-desktop/gui/MainScreen/commands/openNote.js
 packages/app-desktop/gui/MainScreen/commands/openNote.js.map
@@ -328,24 +294,12 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.d.ts
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js.map
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.d.ts
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js.map
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.d.ts
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js
 packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js.map
-packages/app-desktop/gui/MasterPasswordDialog/Dialog.d.ts
-packages/app-desktop/gui/MasterPasswordDialog/Dialog.js
-packages/app-desktop/gui/MasterPasswordDialog/Dialog.js.map
 packages/app-desktop/gui/MenuBar.d.ts
 packages/app-desktop/gui/MenuBar.js
 packages/app-desktop/gui/MenuBar.js.map
@@ -400,9 +354,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js.map
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.d.ts
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollHandler.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js.map
@@ -430,24 +381,21 @@ packages/app-desktop/gui/NoteEditor/NoteEditor.js.map
 packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.d.ts
 packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.js
 packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.js.map
+packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.d.ts
+packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.js
+packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.js.map
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.d.ts
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.js
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.js.map
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.d.ts
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.js
 packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.js.map
-packages/app-desktop/gui/NoteEditor/commands/index.d.ts
-packages/app-desktop/gui/NoteEditor/commands/index.js
-packages/app-desktop/gui/NoteEditor/commands/index.js.map
 packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.d.ts
 packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.js
 packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.js.map
 packages/app-desktop/gui/NoteEditor/commands/showRevisions.d.ts
 packages/app-desktop/gui/NoteEditor/commands/showRevisions.js
 packages/app-desktop/gui/NoteEditor/commands/showRevisions.js.map
-packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.d.ts
-packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.js
-packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.js.map
 packages/app-desktop/gui/NoteEditor/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/styles/index.js
 packages/app-desktop/gui/NoteEditor/styles/index.js.map
@@ -502,18 +450,12 @@ packages/app-desktop/gui/NoteList/NoteList.js.map
 packages/app-desktop/gui/NoteList/commands/focusElementNoteList.d.ts
 packages/app-desktop/gui/NoteList/commands/focusElementNoteList.js
 packages/app-desktop/gui/NoteList/commands/focusElementNoteList.js.map
-packages/app-desktop/gui/NoteList/commands/index.d.ts
-packages/app-desktop/gui/NoteList/commands/index.js
-packages/app-desktop/gui/NoteList/commands/index.js.map
 packages/app-desktop/gui/NoteListControls/NoteListControls.d.ts
 packages/app-desktop/gui/NoteListControls/NoteListControls.js
 packages/app-desktop/gui/NoteListControls/NoteListControls.js.map
 packages/app-desktop/gui/NoteListControls/commands/focusSearch.d.ts
 packages/app-desktop/gui/NoteListControls/commands/focusSearch.js
 packages/app-desktop/gui/NoteListControls/commands/focusSearch.js.map
-packages/app-desktop/gui/NoteListControls/commands/index.d.ts
-packages/app-desktop/gui/NoteListControls/commands/index.js
-packages/app-desktop/gui/NoteListControls/commands/index.js.map
 packages/app-desktop/gui/NoteListItem.d.ts
 packages/app-desktop/gui/NoteListItem.js
 packages/app-desktop/gui/NoteListItem.js.map
@@ -529,9 +471,6 @@ packages/app-desktop/gui/NoteToolbar/NoteToolbar.js.map
 packages/app-desktop/gui/OneDriveLoginScreen.d.ts
 packages/app-desktop/gui/OneDriveLoginScreen.js
 packages/app-desktop/gui/OneDriveLoginScreen.js.map
-packages/app-desktop/gui/PasswordInput/PasswordInput.d.ts
-packages/app-desktop/gui/PasswordInput/PasswordInput.js
-packages/app-desktop/gui/PasswordInput/PasswordInput.js.map
 packages/app-desktop/gui/ResizableLayout/MoveButtons.d.ts
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js.map
@@ -613,21 +552,12 @@ packages/app-desktop/gui/Sidebar/Sidebar.js.map
 packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.d.ts
 packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js
 packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js.map
-packages/app-desktop/gui/Sidebar/commands/index.d.ts
-packages/app-desktop/gui/Sidebar/commands/index.js
-packages/app-desktop/gui/Sidebar/commands/index.js.map
 packages/app-desktop/gui/Sidebar/styles/index.d.ts
 packages/app-desktop/gui/Sidebar/styles/index.js
 packages/app-desktop/gui/Sidebar/styles/index.js.map
 packages/app-desktop/gui/StatusScreen/StatusScreen.d.ts
 packages/app-desktop/gui/StatusScreen/StatusScreen.js
 packages/app-desktop/gui/StatusScreen/StatusScreen.js.map
-packages/app-desktop/gui/StyleSheets/StyleSheetContainer.d.ts
-packages/app-desktop/gui/StyleSheets/StyleSheetContainer.js
-packages/app-desktop/gui/StyleSheets/StyleSheetContainer.js.map
-packages/app-desktop/gui/SyncWizard/Dialog.d.ts
-packages/app-desktop/gui/SyncWizard/Dialog.js
-packages/app-desktop/gui/SyncWizard/Dialog.js.map
 packages/app-desktop/gui/TagList.d.ts
 packages/app-desktop/gui/TagList.js
 packages/app-desktop/gui/TagList.js.map
@@ -691,9 +621,6 @@ packages/app-desktop/gui/utils/NoteListUtils.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
-packages/app-desktop/gui/utils/loadScript.d.ts
-packages/app-desktop/gui/utils/loadScript.js
-packages/app-desktop/gui/utils/loadScript.js.map
 packages/app-desktop/plugins/GotoAnything.d.ts
 packages/app-desktop/plugins/GotoAnything.js
 packages/app-desktop/plugins/GotoAnything.js.map
@@ -742,21 +669,6 @@ packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
-packages/app-desktop/services/share/invitationRespond.d.ts
-packages/app-desktop/services/share/invitationRespond.js
-packages/app-desktop/services/share/invitationRespond.js.map
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.d.ts
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js.map
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.d.ts
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js
-packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js.map
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.d.ts
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.js
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.js.map
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.d.ts
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js
-packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -814,9 +726,6 @@ 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/services/e2ee/RSA.react-native.d.ts
-packages/app-mobile/services/e2ee/RSA.react-native.js
-packages/app-mobile/services/e2ee/RSA.react-native.js.map
 packages/app-mobile/setupQuickActions.d.ts
 packages/app-mobile/setupQuickActions.js
 packages/app-mobile/setupQuickActions.js.map
@@ -895,9 +804,6 @@ packages/generator-joplin/generators/app/templates/api_index.js.map
 packages/generator-joplin/generators/app/templates/src/index.d.ts
 packages/generator-joplin/generators/app/templates/src/index.js
 packages/generator-joplin/generators/app/templates/src/index.js.map
-packages/htmlpack/src/index.d.ts
-packages/htmlpack/src/index.js
-packages/htmlpack/src/index.js.map
 packages/lib/AsyncActionQueue.d.ts
 packages/lib/AsyncActionQueue.js
 packages/lib/AsyncActionQueue.js.map
@@ -937,9 +843,6 @@ packages/lib/JoplinServerApi.js.map
 packages/lib/Logger.d.ts
 packages/lib/Logger.js
 packages/lib/Logger.js.map
-packages/lib/ObjectUtils.d.ts
-packages/lib/ObjectUtils.js
-packages/lib/ObjectUtils.js.map
 packages/lib/PoorManIntervals.d.ts
 packages/lib/PoorManIntervals.js
 packages/lib/PoorManIntervals.js.map
@@ -949,15 +852,9 @@ packages/lib/SyncTargetJoplinCloud.js.map
 packages/lib/SyncTargetJoplinServer.d.ts
 packages/lib/SyncTargetJoplinServer.js
 packages/lib/SyncTargetJoplinServer.js.map
-packages/lib/SyncTargetNone.d.ts
-packages/lib/SyncTargetNone.js
-packages/lib/SyncTargetNone.js.map
 packages/lib/SyncTargetOneDrive.d.ts
 packages/lib/SyncTargetOneDrive.js
 packages/lib/SyncTargetOneDrive.js.map
-packages/lib/SyncTargetRegistry.d.ts
-packages/lib/SyncTargetRegistry.js
-packages/lib/SyncTargetRegistry.js.map
 packages/lib/Synchronizer.d.ts
 packages/lib/Synchronizer.js
 packages/lib/Synchronizer.js.map
@@ -967,33 +864,18 @@ packages/lib/TaskQueue.js.map
 packages/lib/array.d.ts
 packages/lib/array.js
 packages/lib/array.js.map
-packages/lib/callbackUrlUtils.d.ts
-packages/lib/callbackUrlUtils.js
-packages/lib/callbackUrlUtils.js.map
-packages/lib/callbackUrlUtils.test.d.ts
-packages/lib/callbackUrlUtils.test.js
-packages/lib/callbackUrlUtils.test.js.map
 packages/lib/commands/historyBackward.d.ts
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyBackward.js.map
 packages/lib/commands/historyForward.d.ts
 packages/lib/commands/historyForward.js
 packages/lib/commands/historyForward.js.map
-packages/lib/commands/index.d.ts
-packages/lib/commands/index.js
-packages/lib/commands/index.js.map
-packages/lib/commands/openMasterPasswordDialog.d.ts
-packages/lib/commands/openMasterPasswordDialog.js
-packages/lib/commands/openMasterPasswordDialog.js.map
 packages/lib/commands/synchronize.d.ts
 packages/lib/commands/synchronize.js
 packages/lib/commands/synchronize.js.map
-packages/lib/components/EncryptionConfigScreen/utils.d.ts
-packages/lib/components/EncryptionConfigScreen/utils.js
-packages/lib/components/EncryptionConfigScreen/utils.js.map
-packages/lib/database-driver-better-sqlite.d.ts
-packages/lib/database-driver-better-sqlite.js
-packages/lib/database-driver-better-sqlite.js.map
+packages/lib/components/shared/encryption-config-shared.d.ts
+packages/lib/components/shared/encryption-config-shared.js
+packages/lib/components/shared/encryption-config-shared.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1030,15 +912,6 @@ 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/hooks/useAsyncEffect.d.ts
-packages/lib/hooks/useAsyncEffect.js
-packages/lib/hooks/useAsyncEffect.js.map
-packages/lib/hooks/useElementSize.d.ts
-packages/lib/hooks/useElementSize.js
-packages/lib/hooks/useElementSize.js.map
-packages/lib/hooks/useEventListener.d.ts
-packages/lib/hooks/useEventListener.js
-packages/lib/hooks/useEventListener.js.map
 packages/lib/htmlUtils.d.ts
 packages/lib/htmlUtils.js
 packages/lib/htmlUtils.js.map
@@ -1054,9 +927,6 @@ 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/import-enex.d.ts
-packages/lib/import-enex.js
-packages/lib/import-enex.js.map
 packages/lib/locale.d.ts
 packages/lib/locale.js
 packages/lib/locale.js.map
@@ -1090,15 +960,9 @@ packages/lib/models/Folder.test.js.map
 packages/lib/models/ItemChange.d.ts
 packages/lib/models/ItemChange.js
 packages/lib/models/ItemChange.js.map
-packages/lib/models/ItemChange.test.d.ts
-packages/lib/models/ItemChange.test.js
-packages/lib/models/ItemChange.test.js.map
 packages/lib/models/MasterKey.d.ts
 packages/lib/models/MasterKey.js
 packages/lib/models/MasterKey.js.map
-packages/lib/models/MasterKey.test.d.ts
-packages/lib/models/MasterKey.test.js
-packages/lib/models/MasterKey.test.js.map
 packages/lib/models/Migration.d.ts
 packages/lib/models/Migration.js
 packages/lib/models/Migration.js.map
@@ -1159,12 +1023,9 @@ packages/lib/models/utils/paginationToSql.js.map
 packages/lib/models/utils/types.d.ts
 packages/lib/models/utils/types.js
 packages/lib/models/utils/types.js.map
-packages/lib/net-utils.d.ts
-packages/lib/net-utils.js
-packages/lib/net-utils.js.map
-packages/lib/ntp.d.ts
-packages/lib/ntp.js
-packages/lib/ntp.js.map
+packages/lib/ntpDate.d.ts
+packages/lib/ntpDate.js
+packages/lib/ntpDate.js.map
 packages/lib/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1198,6 +1059,12 @@ packages/lib/services/CommandService.test.js.map
 packages/lib/services/DecryptionWorker.d.ts
 packages/lib/services/DecryptionWorker.js
 packages/lib/services/DecryptionWorker.js.map
+packages/lib/services/EncryptionService.d.ts
+packages/lib/services/EncryptionService.js
+packages/lib/services/EncryptionService.js.map
+packages/lib/services/EncryptionService.test.d.ts
+packages/lib/services/EncryptionService.test.js
+packages/lib/services/EncryptionService.test.js.map
 packages/lib/services/ExternalEditWatcher.d.ts
 packages/lib/services/ExternalEditWatcher.js
 packages/lib/services/ExternalEditWatcher.js.map
@@ -1291,33 +1158,6 @@ packages/lib/services/database/types.js.map
 packages/lib/services/debug/populateDatabase.d.ts
 packages/lib/services/debug/populateDatabase.js
 packages/lib/services/debug/populateDatabase.js.map
-packages/lib/services/e2ee/EncryptionService.d.ts
-packages/lib/services/e2ee/EncryptionService.js
-packages/lib/services/e2ee/EncryptionService.js.map
-packages/lib/services/e2ee/EncryptionService.test.d.ts
-packages/lib/services/e2ee/EncryptionService.test.js
-packages/lib/services/e2ee/EncryptionService.test.js.map
-packages/lib/services/e2ee/RSA.node.d.ts
-packages/lib/services/e2ee/RSA.node.js
-packages/lib/services/e2ee/RSA.node.js.map
-packages/lib/services/e2ee/ppk.d.ts
-packages/lib/services/e2ee/ppk.js
-packages/lib/services/e2ee/ppk.js.map
-packages/lib/services/e2ee/ppk.test.d.ts
-packages/lib/services/e2ee/ppk.test.js
-packages/lib/services/e2ee/ppk.test.js.map
-packages/lib/services/e2ee/ppkTestUtils.d.ts
-packages/lib/services/e2ee/ppkTestUtils.js
-packages/lib/services/e2ee/ppkTestUtils.js.map
-packages/lib/services/e2ee/types.d.ts
-packages/lib/services/e2ee/types.js
-packages/lib/services/e2ee/types.js.map
-packages/lib/services/e2ee/utils.d.ts
-packages/lib/services/e2ee/utils.js
-packages/lib/services/e2ee/utils.js.map
-packages/lib/services/e2ee/utils.test.d.ts
-packages/lib/services/e2ee/utils.test.js
-packages/lib/services/e2ee/utils.test.js.map
 packages/lib/services/interop/InteropService.d.ts
 packages/lib/services/interop/InteropService.js
 packages/lib/services/interop/InteropService.js.map
@@ -1342,15 +1182,6 @@ packages/lib/services/interop/InteropService_Exporter_Jex.js.map
 packages/lib/services/interop/InteropService_Exporter_Md.d.ts
 packages/lib/services/interop/InteropService_Exporter_Md.js
 packages/lib/services/interop/InteropService_Exporter_Md.js.map
-packages/lib/services/interop/InteropService_Exporter_Md.test.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md.test.js
-packages/lib/services/interop/InteropService_Exporter_Md.test.js.map
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js.map
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.d.ts
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js
-packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js.map
 packages/lib/services/interop/InteropService_Exporter_Raw.d.ts
 packages/lib/services/interop/InteropService_Exporter_Raw.js
 packages/lib/services/interop/InteropService_Exporter_Raw.js.map
@@ -1372,15 +1203,6 @@ packages/lib/services/interop/InteropService_Importer_Jex.js.map
 packages/lib/services/interop/InteropService_Importer_Md.d.ts
 packages/lib/services/interop/InteropService_Importer_Md.js
 packages/lib/services/interop/InteropService_Importer_Md.js.map
-packages/lib/services/interop/InteropService_Importer_Md.test.d.ts
-packages/lib/services/interop/InteropService_Importer_Md.test.js
-packages/lib/services/interop/InteropService_Importer_Md.test.js.map
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.d.ts
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js.map
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.d.ts
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js
-packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js.map
 packages/lib/services/interop/InteropService_Importer_Raw.d.ts
 packages/lib/services/interop/InteropService_Importer_Raw.js
 packages/lib/services/interop/InteropService_Importer_Raw.js.map
@@ -1537,12 +1359,6 @@ packages/lib/services/rest/actionApi.desktop.js.map
 packages/lib/services/rest/routes/auth.d.ts
 packages/lib/services/rest/routes/auth.js
 packages/lib/services/rest/routes/auth.js.map
-packages/lib/services/rest/routes/events.d.ts
-packages/lib/services/rest/routes/events.js
-packages/lib/services/rest/routes/events.js.map
-packages/lib/services/rest/routes/events.test.d.ts
-packages/lib/services/rest/routes/events.test.js
-packages/lib/services/rest/routes/events.test.js.map
 packages/lib/services/rest/routes/folders.d.ts
 packages/lib/services/rest/routes/folders.js
 packages/lib/services/rest/routes/folders.js.map
@@ -1624,21 +1440,6 @@ packages/lib/services/spellChecker/SpellCheckerService.js.map
 packages/lib/services/spellChecker/SpellCheckerServiceDriverBase.d.ts
 packages/lib/services/spellChecker/SpellCheckerServiceDriverBase.js
 packages/lib/services/spellChecker/SpellCheckerServiceDriverBase.js.map
-packages/lib/services/style/cssToTheme.d.ts
-packages/lib/services/style/cssToTheme.js
-packages/lib/services/style/cssToTheme.js.map
-packages/lib/services/style/cssToTheme.test.d.ts
-packages/lib/services/style/cssToTheme.test.js
-packages/lib/services/style/cssToTheme.test.js.map
-packages/lib/services/style/loadCssToTheme.d.ts
-packages/lib/services/style/loadCssToTheme.js
-packages/lib/services/style/loadCssToTheme.js.map
-packages/lib/services/style/themeToCss.d.ts
-packages/lib/services/style/themeToCss.js
-packages/lib/services/style/themeToCss.js.map
-packages/lib/services/style/themeToCss.test.d.ts
-packages/lib/services/style/themeToCss.test.js
-packages/lib/services/style/themeToCss.test.js.map
 packages/lib/services/synchronizer/ItemUploader.d.ts
 packages/lib/services/synchronizer/ItemUploader.js
 packages/lib/services/synchronizer/ItemUploader.js.map
@@ -1660,9 +1461,6 @@ 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.ppk.test.d.ts
-packages/lib/services/synchronizer/Synchronizer.ppk.test.js
-packages/lib/services/synchronizer/Synchronizer.ppk.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
@@ -1687,18 +1485,6 @@ 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/migrations/3.d.ts
-packages/lib/services/synchronizer/migrations/3.js
-packages/lib/services/synchronizer/migrations/3.js.map
-packages/lib/services/synchronizer/syncDebugLog.d.ts
-packages/lib/services/synchronizer/syncDebugLog.js
-packages/lib/services/synchronizer/syncDebugLog.js.map
-packages/lib/services/synchronizer/syncInfoUtils.d.ts
-packages/lib/services/synchronizer/syncInfoUtils.js
-packages/lib/services/synchronizer/syncInfoUtils.js.map
-packages/lib/services/synchronizer/syncInfoUtils.test.d.ts
-packages/lib/services/synchronizer/syncInfoUtils.test.js
-packages/lib/services/synchronizer/syncInfoUtils.test.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
@@ -1795,12 +1581,6 @@ packages/plugin-repo-cli/lib/gitCompareUrl.js.map
 packages/plugin-repo-cli/lib/gitCompareUrl.test.d.ts
 packages/plugin-repo-cli/lib/gitCompareUrl.test.js
 packages/plugin-repo-cli/lib/gitCompareUrl.test.js.map
-packages/plugin-repo-cli/lib/overrideUtils.d.ts
-packages/plugin-repo-cli/lib/overrideUtils.js
-packages/plugin-repo-cli/lib/overrideUtils.js.map
-packages/plugin-repo-cli/lib/overrideUtils.test.d.ts
-packages/plugin-repo-cli/lib/overrideUtils.test.js
-packages/plugin-repo-cli/lib/overrideUtils.test.js.map
 packages/plugin-repo-cli/lib/types.d.ts
 packages/plugin-repo-cli/lib/types.js
 packages/plugin-repo-cli/lib/types.js.map
@@ -1810,9 +1590,6 @@ packages/plugin-repo-cli/lib/updateReadme.js.map
 packages/plugin-repo-cli/lib/updateReadme.test.d.ts
 packages/plugin-repo-cli/lib/updateReadme.test.js
 packages/plugin-repo-cli/lib/updateReadme.test.js.map
-packages/plugin-repo-cli/lib/utils.d.ts
-packages/plugin-repo-cli/lib/utils.js
-packages/plugin-repo-cli/lib/utils.js.map
 packages/plugins/ToggleSidebars/api/index.d.ts
 packages/plugins/ToggleSidebars/api/index.js
 packages/plugins/ToggleSidebars/api/index.js.map
@@ -1879,18 +1656,12 @@ packages/renderer/MdToHtml/rules/mermaid.js.map
 packages/renderer/MdToHtml/rules/sanitize_html.d.ts
 packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/sanitize_html.js.map
-packages/renderer/MdToHtml/rules/source_map.d.ts
-packages/renderer/MdToHtml/rules/source_map.js
-packages/renderer/MdToHtml/rules/source_map.js.map
 packages/renderer/MdToHtml/setupLinkify.d.ts
 packages/renderer/MdToHtml/setupLinkify.js
 packages/renderer/MdToHtml/setupLinkify.js.map
 packages/renderer/MdToHtml/validateLinks.d.ts
 packages/renderer/MdToHtml/validateLinks.js
 packages/renderer/MdToHtml/validateLinks.js.map
-packages/renderer/headerAnchor.d.ts
-packages/renderer/headerAnchor.js
-packages/renderer/headerAnchor.js.map
 packages/renderer/htmlUtils.d.ts
 packages/renderer/htmlUtils.js
 packages/renderer/htmlUtils.js.map
@@ -1909,21 +1680,12 @@ packages/renderer/utils.js.map
 packages/tools/buildServerDocker.d.ts
 packages/tools/buildServerDocker.js
 packages/tools/buildServerDocker.js.map
-packages/tools/buildServerDocker.test.d.ts
-packages/tools/buildServerDocker.test.js
-packages/tools/buildServerDocker.test.js.map
-packages/tools/convertThemesToCss.d.ts
-packages/tools/convertThemesToCss.js
-packages/tools/convertThemesToCss.js.map
 packages/tools/generate-database-types.d.ts
 packages/tools/generate-database-types.js
 packages/tools/generate-database-types.js.map
 packages/tools/generate-images.d.ts
 packages/tools/generate-images.js
 packages/tools/generate-images.js.map
-packages/tools/git-changelog.d.ts
-packages/tools/git-changelog.js
-packages/tools/git-changelog.js.map
 packages/tools/lerna-add.d.ts
 packages/tools/lerna-add.js
 packages/tools/lerna-add.js.map
@@ -1942,33 +1704,15 @@ packages/tools/release-ios.js.map
 packages/tools/release-server.d.ts
 packages/tools/release-server.js
 packages/tools/release-server.js.map
-packages/tools/setupNewRelease.d.ts
-packages/tools/setupNewRelease.js
-packages/tools/setupNewRelease.js.map
-packages/tools/tagServerLatest.d.ts
-packages/tools/tagServerLatest.js
-packages/tools/tagServerLatest.js.map
 packages/tools/tool-utils.d.ts
 packages/tools/tool-utils.js
 packages/tools/tool-utils.js.map
-packages/tools/update-readme-download.d.ts
-packages/tools/update-readme-download.js
-packages/tools/update-readme-download.js.map
 packages/tools/update-readme-sponsors.d.ts
 packages/tools/update-readme-sponsors.js
 packages/tools/update-readme-sponsors.js.map
-packages/tools/updateMarkdownDoc.d.ts
-packages/tools/updateMarkdownDoc.js
-packages/tools/updateMarkdownDoc.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
-packages/tools/website/updateDownloadPage.d.ts
-packages/tools/website/updateDownloadPage.js
-packages/tools/website/updateDownloadPage.js.map
-packages/tools/website/utils/frontMatter.d.ts
-packages/tools/website/utils/frontMatter.js
-packages/tools/website/utils/frontMatter.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map

Assets/WebsiteAssets/css/site.css

@@ -18,18 +18,10 @@ a {
 	text-decoration: none;
 }
 
-ol, ul {
-	padding-left: 1rem;
-}
-
-.row > ul, ol {
-	margin-left: 1rem;
-}
-
 #main-container {
 	position: relative;
 	min-height: 100vh;
-	padding-bottom: 127px; /* Needs to be the height of the footer */
+	padding-bottom: 225px;
 }
 
 .help-page-container img {
@@ -121,10 +113,6 @@ blockquote {
 	font-size: 16px !important;
 }
 
-.button-link {
-	white-space: nowrap;
-}
-
 .sponsor-button i {
 	font-size: 0.8em;
 }
@@ -188,11 +176,6 @@ h2 {
 	padding-bottom: 0.5em;
 }
 
-h3 {
-	font-size: 1.3em;
-	margin-bottom: 0.8rem;
-}
-
 .front-page h1 {
 	font-size: 3em;
 }
@@ -304,12 +287,6 @@ p,
 	/* margin-bottom: 10px; */
 }
 
-div.navbar-mobile-content a.sponsor-button {
-	padding: 4px 12px;
-	font-size: 0.9em;
-	margin-right: 1em;
-}
-
 #nav-section.white-bg a {
 	color: #0557ba;
 }
@@ -523,17 +500,12 @@ div.navbar-mobile-content a.sponsor-button {
 
 .bottom-links {
 	display: flex;
-	flex-direction: row;
 	justify-content: center;
 	border-top: 1px solid #d4d4d4;
 	margin-top: 30px;
 	padding-top: 25px;
 }
 
-.bottom-links .bottom-link {
-	margin-right: 20px;
-}
-
 /* TOC */
 
 #toc ul {
@@ -593,7 +565,7 @@ div.navbar-mobile-content a.sponsor-button {
 
 /* footer section  */
 footer {
-	padding-top: 30px;
+	padding-top: 50px;
 	padding-bottom: 30px;
 	position: absolute;
 	bottom: 0;
@@ -604,7 +576,6 @@ footer a,
 footer p {
 	color: #90b1d9;
 	text-decoration: none;
-	margin-bottom: 0;
 }
 
 footer a:hover {
@@ -628,53 +599,6 @@ footer .right-links a {
 	margin-left: 15px;
 }
 
-footer .footer-right {
-	margin-left: 30px;
-}
-
-footer .social-links {
-	display: flex;
-	flex-direction: row;
-	justify-content: center;
-	padding-bottom: 20px;
-	border-bottom: 1px solid #315885;
-}
-
-footer .social-links a:hover {
-	color: #e8f3ff;
-}
-
-footer .social-links i {
-	margin-left: 15px;
-	font-size: 22px;
-}
-
-footer .bottom-links-row {
-	padding-top: 20px;
-}
-
-footer .bottom-links-row p {
-	font-size: 1.1em;
-}
-
-/*****************************************************************
- WHAT'S NEW PAGE
-*****************************************************************/
-
-.news-page      .container > .content-wrapper,
-.news-item-page .container > .content-wrapper {
-	/* Set the line width so that there's no more than 75 characters per line */
-	/* https://baymard.com/blog/line-length-readability */
-	max-width: 650px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-.news-page     img,
-.news-item-page img {
-	max-width: 650px;
-}
-
 /*****************************************************************
  IN THE PRESS
  The "In the press" section height needs to be adjusted as the
@@ -737,7 +661,7 @@ footer .bottom-links-row p {
 	#main-container {
 		position: relative;
 		min-height: 100vh;
-		padding-bottom: 130px;
+		padding-bottom: 260px;
 	}
 
 	.front-page h1 {
@@ -924,7 +848,7 @@ footer .bottom-links-row p {
 
 .help-page-container {
 	padding-top: 90px;
-	padding-bottom: 70px;
+	padding-bottom: 50px;
 }
 
 .donate-links {
@@ -938,7 +862,7 @@ footer .bottom-links-row p {
 	border-radius: 20px;
 	padding: 30px 20px;
 	padding-bottom: 30px;
-	margin-bottom: 20px;
+	margin-bottom: 50px;
 	margin-top: 40px;
 }
 
@@ -963,7 +887,7 @@ footer .bottom-links-row p {
 	background: linear-gradient(251.85deg, #0b4f99 -11.85%, #002d61 104.73%);
 	box-shadow: 0px 4px 16px rgba(105, 132, 172, 0.13);
 	margin-top: 30px;
-	padding-top: 40px;
+	padding-top: 50px;
 	color: white;
 }
 
@@ -981,11 +905,6 @@ footer .bottom-links-row p {
 	justify-content: center;
 }
 
-.plan-group .joplin-cloud-login-info {
-	margin-bottom: 40px;
-	text-align: center;
-}
-
 .plan-group .plan-price-yearly-per-year {
 	display: flex;
 	justify-content: flex-end;
@@ -1028,7 +947,6 @@ footer .bottom-links-row p {
 
 .price-row .plan-type img {
 	width: 65px;
-	margin-bottom: 0;
 }
 
 .price-row .plan-price {

Assets/WebsiteAssets/templates/front.mustache

@@ -11,7 +11,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
 		<meta name="description" content="Joplin, the open source note-taking application" />
-		<link rel="stylesheet" href="{{{assetUrls.css.fontawesome}}}">
+		<link rel="stylesheet" href="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
@@ -29,7 +29,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<link rel="stylesheet" href="{{{assetUrls.css.site}}}" as="style" />
+		<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
 		<title>Joplin</title>
 	</head>
 	<body class="front-page website-env-{{env}}">
@@ -368,7 +368,40 @@
 				</div>
 			</div>
 
-			{{> footer}}
+			<footer class="darkblue-bg">
+				<div class="container">
+					<div class="row">
+						<div class="col-3 d-none d-md-block">
+							<img src="{{imageBaseUrl}}/logo-text.svg" alt="" width="150" />
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-12">
+							<hr />
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-12 col-md-6">
+							<a href="{{baseUrl}}">
+								<img
+									src="{{imageBaseUrl}}/logo-text.svg"
+									width="120"
+									class="img-center d-block d-md-none"
+									alt=""
+								/>
+							</a>
+							<br class="d-block d-md-none" />
+							<p class="text-center-sm">Copyright &copy; 2016-{{yyyy}} Laurent Cozic</p>
+						</div>
+						<div class="col-12 col-md-6">
+							<p class="text-right text-center-sm right-links">
+								<a href="https://github.com/laurent22/joplin/" class="github-link"><i class="fab fa-github"></i> GitHub Repository</a>
+								<a href="{{baseUrl}}/privacy/">Privacy Policy</a>
+							</p>
+						</div>
+					</div>
+				</div>
+			</footer>
 		</div>
 
 		<script
@@ -376,7 +409,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<script src="{{{assetUrls.js.script}}}"></script>
+		<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
 		{{> analytics}}
 	</body>
 </html>

Assets/WebsiteAssets/templates/main-new.mustache

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="{{{assetUrls.css.fontawesome}}}">
+		<link rel="stylesheet" href="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,7 +37,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="{{{assetUrls.css.site}}}" as="style" />
+		<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
 		<title>{{pageTitle}}</title>
 
 		<script
@@ -63,30 +63,53 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 								Running in {{env}} mode!
 							</div>
 							{{{contentHtml}}}
-							{{#showBottomLinks}}
+							{{#showImproveThisDoc}}
 								<div class="bottom-links">
-									{{#discussOnForumLink}}
-										<a class="bottom-link" href="{{{discussOnForumLink}}}">
-											<i class="fab fa-discourse"></i></i> Discuss on the forum
-										</a>
-									{{/discussOnForumLink}}
-									{{#showImproveThisDoc}}
-										<a class="bottom-link" href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
-											<i class="fab fa-github"></i> Improve this doc
-										</a>
-									{{/showImproveThisDoc}}
+									<a href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
+										<i class="fab fa-github"></i> Improve this doc
+									</a>
 								</div>
-							{{/showBottomLinks}}
+							{{/showImproveThisDoc}}
 						</div>
 					</div>
 				</div>
 			</div>
 
-			
-			{{> footer}}
+			<footer class="darkblue-bg">
+				<div class="container">
+					<div class="row">
+						<div class="col-3 d-none d-md-block">
+							<img src="{{imageBaseUrl}}/logo-text.svg" alt="" width="150" />
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-12">
+							<hr />
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-12 col-md-6">
+							<img
+								src="{{imageBaseUrl}}/logo-text.svg"
+								width="120"
+								class="img-center d-block d-md-none"
+								alt=""
+							/>
+							<br class="d-block d-md-none" />
+							<p class="text-center-sm">Copyright &copy; 2016-{{yyyy}} Laurent Cozic</p>
+						</div>
+						<div class="col-12 col-md-6 right-links">
+							<p class="text-right text-center-sm">
+								<a href="https://github.com/laurent22/joplin/" class="github-link"><i class="fab fa-github"></i> GitHub Repository</a>
+								<a href="{{baseUrl}}/privacy/">Privacy Policy</a>
+							</p>
+						</div>
+					</div>
+				</div>
+			</footer>
 		</div>
 
-		<script src="{{{assetUrls.js.script}}}"></script>
+		<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
 
 		{{> analytics}}
 	</body>

Assets/WebsiteAssets/templates/partials/footer.mustache

@@ -1,27 +0,0 @@
-<footer class="darkblue-bg">
-	<div class="container">
-		<div class="row">
-			<div class="col-12 col-md-12 social-links">
-				<a href="https://twitter.com/joplinapp" title="Joplin Twitter feed"><i class="fab fa-twitter"></i></a>
-				<a href="https://mastodon.social/@joplinapp" title="Joplin Mastodon feed"><i class="fab fa-mastodon"></i></a>
-				<a href="https://www.patreon.com/joplin" title="Joplin Patreon"><i class="fab fa-patreon"></i></a>
-				<a href="https://discord.gg/VSj7AFHvpq" title="Joplin Discord chat"><i class="fab fa-discord"></i></a>
-				<a href="https://www.reddit.com/r/joplinapp/" title="Joplin Subreddit"><i class="fab fa-reddit"></i></a>
-				<a href="https://github.com/laurent22/joplin/" title="Joplin GitHub repository"><i class="fab fa-github"></i></a>
-			</div>
-		</div>
-
-		<div class="row bottom-links-row">
-			<div class="col-12 col-md-6">
-				<p class="text-center-sm">Copyright &copy; 2016-{{yyyy}} Laurent Cozic</p>
-			</div>
-			<div class="col-12 col-md-6">
-				<p class="text-right text-center-sm right-links">
-					<span class="footer-right">
-						<a href="{{baseUrl}}/privacy/">Privacy Policy</a>
-					</span>
-				</p>
-			</div>
-		</div>
-	</div>
-</footer>

Assets/WebsiteAssets/templates/partials/gaOptimize.mustache

@@ -1,5 +1,2 @@
 <!-- Donate button A/B testing -->
-
-<!--
-<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
--->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>

Assets/WebsiteAssets/templates/partials/navbar.mustache

@@ -12,7 +12,6 @@
 				</a>
 			</div>
 			<div class="col-9 text-right d-none d-md-block">
-				<a href="{{baseUrl}}/news/" class="fw500">What's New</a>
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
 				{{#showJoplinCloudLinks}}
@@ -20,9 +19,7 @@
 				{{/showJoplinCloudLinks}}
 				{{> supportButton}}
 			</div>
-			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
-				{{> supportButton}}
-
+			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
 					><img
 						src="{{#isFrontPage}}{{imageBaseUrl}}/mobile-menu-open-icon.png{{/isFrontPage}}{{^isFrontPage}}{{imageBaseUrl}}/mobile-menu-black-open-icon.png{{/isFrontPage}}"
@@ -43,9 +40,8 @@
 						</div>
 
 						<div class="text-center menu-mobile-top">
-							<a href="{{baseUrl}}/news/" class="fw500 mobile-menu-link">What's New</a>
-							<a href="{{baseUrl}}/help/" class="fw500 mobile-menu-link">Help</a>
 							<a href="{{forumUrl}}" class="fw500 mobile-menu-link">Forum</a>
+							<a href="{{baseUrl}}/help/" class="fw500 mobile-menu-link">Help</a>
 						</div>
 
 						<div class="menu-mobile-buttons">

Assets/WebsiteAssets/templates/plans.mustache

@@ -6,7 +6,7 @@
 					Joplin Cloud <span class="frame-bg frame-bg-yellow">plans</span>
 				</h1>
 				<p class="text-center sub-title">
-					<a href="https://joplincloud.com">Joplin Cloud</a> allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues.
+					Joplin Cloud allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues.
 				</p>
 			</div>
 		</div>
@@ -45,8 +45,6 @@
 			{{#plans.business}}
 				{{> plan}}
 			{{/plans.business}}
-
-			<p class="joplin-cloud-login-info">Already have a Joplin Cloud account? <a href="https://joplincloud.com">Login now</a></p>
 		</div>
 
 		<div class="row">
@@ -59,7 +57,7 @@
 	<script>
 		const urlQuery = new URLSearchParams(location.search);
 		let subscriptionPeriod = 'monthly';
-		const stripe = Stripe('{{{stripeConfig.publishableKey}}}');
+		var stripe = Stripe('{{{stripeConfig.publishableKey}}}');
 
 		let checkoutSessionUser = null;
 
@@ -82,9 +80,9 @@
 		}
 
 		var createCheckoutSession = function(priceId) {
-			const promotionCode = urlQuery.get('promo') || '';
+			const coupon = urlQuery.get('coupon') || '';
 
-			console.info('Creating Stripe session for price:', priceId, 'Promotion code:', promotionCode);
+			console.info('Creating Stripe session for price:', priceId, 'Coupon:', coupon);
 
 			return fetch("{{{stripeConfig.webhookBaseUrl}}}/stripe/createCheckoutSession", {
 				method: "POST",
@@ -92,8 +90,8 @@
 					"Content-Type": "application/json"
 				},
 				body: JSON.stringify({
-					priceId,
-					promotionCode,
+					priceId: priceId,
+					coupon: coupon,
 					email: checkoutSessionUser ? checkoutSessionUser.email : '',
 				})
 			}).then(async function(result) {