Plugin Repo CLI v2.6.7

Auto-updated using release-website.sh

.dockerignore

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

.eslintignore

@@ -3,22 +3,18 @@ _releases/
 .git/
 .github/
 *.min.js
+**/commands/index.ts
 **/node_modules/
+.yarn/
 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-desktop/build/
+packages/app-cli/tests/test data/
 packages/app-cli/build
 packages/app-cli/build/
 packages/app-cli/locales
@@ -47,21 +43,31 @@ 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/app-mobile/lib/rnInjectedJs/
-packages/app-mobile/components/NoteEditor/CodeMirror.bundle.js
+packages/fork-*
+packages/htmlpack/dist/
 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/fork-*
+packages/turndown-plugin-gfm/
+packages/turndown/
 plugin_types/
 readme/
 
@@ -75,6 +81,12 @@ 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
@@ -84,9 +96,6 @@ 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
@@ -111,6 +120,9 @@ 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
@@ -120,6 +132,12 @@ 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
@@ -138,6 +156,9 @@ 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
@@ -201,9 +222,15 @@ 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/EncryptionConfigScreen.d.ts
-packages/app-desktop/gui/EncryptionConfigScreen.js
-packages/app-desktop/gui/EncryptionConfigScreen.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/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
@@ -228,6 +255,9 @@ 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
@@ -240,6 +270,12 @@ 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
@@ -258,6 +294,9 @@ 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
@@ -309,12 +348,24 @@ 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
@@ -369,6 +420,9 @@ 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
@@ -396,21 +450,24 @@ 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
@@ -465,12 +522,18 @@ 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
@@ -486,6 +549,9 @@ 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
@@ -567,12 +633,21 @@ 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
@@ -636,6 +711,9 @@ 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
@@ -684,6 +762,21 @@ 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
@@ -741,6 +834,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/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
@@ -819,6 +915,9 @@ 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
@@ -858,6 +957,9 @@ 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
@@ -867,9 +969,15 @@ 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
@@ -879,18 +987,33 @@ 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/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/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/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -927,6 +1050,15 @@ 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
@@ -942,6 +1074,9 @@ 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
@@ -975,6 +1110,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
@@ -1041,9 +1179,12 @@ 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/ntpDate.d.ts
-packages/lib/ntpDate.js
-packages/lib/ntpDate.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/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1077,12 +1218,6 @@ 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
@@ -1176,9 +1311,33 @@ 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
@@ -1203,6 +1362,15 @@ 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
@@ -1224,6 +1392,15 @@ 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
@@ -1335,9 +1512,6 @@ packages/lib/services/plugins/api/types.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
-packages/lib/services/plugins/sandboxProxy.d.ts
-packages/lib/services/plugins/sandboxProxy.js
-packages/lib/services/plugins/sandboxProxy.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
@@ -1365,6 +1539,12 @@ packages/lib/services/plugins/utils/validatePluginId.js.map
 packages/lib/services/plugins/utils/validatePluginId.test.d.ts
 packages/lib/services/plugins/utils/validatePluginId.test.js
 packages/lib/services/plugins/utils/validatePluginId.test.js.map
+packages/lib/services/plugins/utils/validatePluginVersion.d.ts
+packages/lib/services/plugins/utils/validatePluginVersion.js
+packages/lib/services/plugins/utils/validatePluginVersion.js.map
+packages/lib/services/plugins/utils/validatePluginVersion.test.d.ts
+packages/lib/services/plugins/utils/validatePluginVersion.test.js
+packages/lib/services/plugins/utils/validatePluginVersion.test.js.map
 packages/lib/services/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
@@ -1380,6 +1560,12 @@ 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
@@ -1461,6 +1647,21 @@ 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
@@ -1482,6 +1683,9 @@ 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
@@ -1509,9 +1713,15 @@ 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
@@ -1608,6 +1818,12 @@ 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
@@ -1617,6 +1833,9 @@ 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
@@ -1683,12 +1902,18 @@ 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
@@ -1707,15 +1932,21 @@ 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/lerna-add.d.ts
-packages/tools/lerna-add.js
-packages/tools/lerna-add.js.map
+packages/tools/git-changelog.d.ts
+packages/tools/git-changelog.js
+packages/tools/git-changelog.js.map
 packages/tools/release-android.d.ts
 packages/tools/release-android.js
 packages/tools/release-android.js.map
@@ -1728,21 +1959,39 @@ packages/tools/release-electron.js.map
 packages/tools/release-ios.d.ts
 packages/tools/release-ios.js
 packages/tools/release-ios.js.map
+packages/tools/release-plugin-repo-cli.d.ts
+packages/tools/release-plugin-repo-cli.js
+packages/tools/release-plugin-repo-cli.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,6 +171,55 @@ 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,7 +9,8 @@ assignees: ''
 
 <!--
   Please provide a clear and concise description of what the bug is. (In the section Steps To Reproduce.)
-  Include screenshots if needed.
+  Include screenshots for UI problems if needed.
+  DO NOT create screenshots of text !!! Copy and paste the text into a code block.
   Please test using the latest Joplin release to make sure your issue has not already been fixed.
 -->
 

.github/scripts/run_ci.sh

@@ -46,13 +46,14 @@ echo "IS_MACOS=$IS_MACOS"
 
 echo "Node $( node -v )"
 echo "Npm $( npm -v )"
+echo "Yarn $( yarn -v )"
 
 # =============================================================================
 # Install packages
 # =============================================================================
 
 cd "$ROOT_DIR"
-npm install
+yarn install
 
 # =============================================================================
 # Run test units. Only do it for pull requests and dev branch because we don't
@@ -62,7 +63,23 @@ npm install
 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running tests..."
 
-	npm run test-ci
+	# 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"
+	yarn run test-ci
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -74,10 +91,10 @@ fi
 # release randomly fail.
 # =============================================================================
 
-if [ "$IS_PULL_REQUEST" == "1" ]; then
+if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running linter..."
 
-	npm run linter-ci ./
+	yarn run linter-ci ./
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -102,6 +119,27 @@ 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
@@ -117,25 +155,24 @@ if [ "$IS_PULL_REQUEST" == "1" ]; then
 fi
 
 # =============================================================================
-# Prepare the Electron app and build it
+# Build the Electron app or Docker image depending on the current tag.
 #
 # 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"
 
 if [[ $GIT_TAG_NAME = v* ]]; then
 	echo "Step: Building and publishing desktop application..."
-	USE_HARD_LINKS=false npm run dist
+	USE_HARD_LINKS=false yarn run dist
 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
+	yarn run buildServerDocker -- --tag-name $GIT_TAG_NAME --push-images
 else
 	echo "Step: Building but *not* publishing desktop application..."
-	USE_HARD_LINKS=false npm run dist -- --publish=never
+	USE_HARD_LINKS=false yarn run dist -- --publish=never
 fi

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

@@ -19,9 +19,18 @@ 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' && startsWith(github.ref, 'refs/tags/server-v')
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get install -y apt-transport-https
           sudo apt-get install -y ca-certificates
@@ -40,6 +49,11 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
+
+      - name: Install Yarn
+        run: |
+          # https://yarnpkg.com/getting-started/install
+          corepack enable
       
       # 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
@@ -71,6 +85,44 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           IS_CONTINUOUS_INTEGRATION: 1
         run: |
-          npm install
+          yarn install
           cd packages/app-desktop
-          npm run dist
+          yarn run dist
+
+  ServerDockerImage:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    steps:
+
+      - name: Install Docker Engine
+        run: |
+          sudo apt-get install -y apt-transport-https
+          sudo apt-get install -y ca-certificates
+          sudo apt-get install -y curl
+          sudo apt-get install -y gnupg
+          sudo apt-get install -y lsb-release
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+          echo \
+              "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
+              $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+          sudo apt-get update || true
+          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      - name: Install Yarn
+        run: |
+          # https://yarnpkg.com/getting-started/install
+          corepack enable
+
+      - name: Build Docker Image
+        run: |
+          yarn install
+          yarn run buildServerDocker --tag-name server-v0.0.0
+          

.gitignore

@@ -49,6 +49,18 @@ packages/tools/commit_hook.txt
 packages/tools/github_oauth_token.txt
 lerna-debug.log
 .env
+docs/**/*.mustache
+
+# Yarn stuff
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.d.ts
@@ -60,6 +72,12 @@ 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
@@ -69,9 +87,6 @@ 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
@@ -96,6 +111,9 @@ 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
@@ -105,6 +123,12 @@ 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
@@ -123,6 +147,9 @@ 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
@@ -186,9 +213,15 @@ 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/EncryptionConfigScreen.d.ts
-packages/app-desktop/gui/EncryptionConfigScreen.js
-packages/app-desktop/gui/EncryptionConfigScreen.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/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
@@ -213,6 +246,9 @@ 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
@@ -225,6 +261,12 @@ 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
@@ -243,6 +285,9 @@ 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
@@ -294,12 +339,24 @@ 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
@@ -354,6 +411,9 @@ 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
@@ -381,21 +441,24 @@ 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
@@ -450,12 +513,18 @@ 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
@@ -471,6 +540,9 @@ 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
@@ -552,12 +624,21 @@ 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
@@ -621,6 +702,9 @@ 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
@@ -669,6 +753,21 @@ 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
@@ -726,6 +825,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/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
@@ -804,6 +906,9 @@ 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
@@ -843,6 +948,9 @@ 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
@@ -852,9 +960,15 @@ 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
@@ -864,18 +978,33 @@ 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/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/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/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -912,6 +1041,15 @@ 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
@@ -927,6 +1065,9 @@ 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
@@ -960,6 +1101,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
@@ -1026,9 +1170,12 @@ 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/ntpDate.d.ts
-packages/lib/ntpDate.js
-packages/lib/ntpDate.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/onedrive-api.d.ts
 packages/lib/onedrive-api.js
 packages/lib/onedrive-api.js.map
@@ -1062,12 +1209,6 @@ 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
@@ -1161,9 +1302,33 @@ 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
@@ -1188,6 +1353,15 @@ 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
@@ -1209,6 +1383,15 @@ 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
@@ -1320,9 +1503,6 @@ packages/lib/services/plugins/api/types.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
-packages/lib/services/plugins/sandboxProxy.d.ts
-packages/lib/services/plugins/sandboxProxy.js
-packages/lib/services/plugins/sandboxProxy.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
@@ -1350,6 +1530,12 @@ packages/lib/services/plugins/utils/validatePluginId.js.map
 packages/lib/services/plugins/utils/validatePluginId.test.d.ts
 packages/lib/services/plugins/utils/validatePluginId.test.js
 packages/lib/services/plugins/utils/validatePluginId.test.js.map
+packages/lib/services/plugins/utils/validatePluginVersion.d.ts
+packages/lib/services/plugins/utils/validatePluginVersion.js
+packages/lib/services/plugins/utils/validatePluginVersion.js.map
+packages/lib/services/plugins/utils/validatePluginVersion.test.d.ts
+packages/lib/services/plugins/utils/validatePluginVersion.test.js
+packages/lib/services/plugins/utils/validatePluginVersion.test.js.map
 packages/lib/services/rest/Api.d.ts
 packages/lib/services/rest/Api.js
 packages/lib/services/rest/Api.js.map
@@ -1365,6 +1551,12 @@ 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
@@ -1446,6 +1638,21 @@ 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
@@ -1467,6 +1674,9 @@ 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
@@ -1494,9 +1704,15 @@ 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
@@ -1593,6 +1809,12 @@ 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
@@ -1602,6 +1824,9 @@ 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
@@ -1668,12 +1893,18 @@ 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
@@ -1692,15 +1923,21 @@ 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/lerna-add.d.ts
-packages/tools/lerna-add.js
-packages/tools/lerna-add.js.map
+packages/tools/git-changelog.d.ts
+packages/tools/git-changelog.js
+packages/tools/git-changelog.js.map
 packages/tools/release-android.d.ts
 packages/tools/release-android.js
 packages/tools/release-android.js.map
@@ -1713,21 +1950,39 @@ packages/tools/release-electron.js.map
 packages/tools/release-ios.d.ts
 packages/tools/release-ios.js
 packages/tools/release-ios.js.map
+packages/tools/release-plugin-repo-cli.d.ts
+packages/tools/release-plugin-repo-cli.js
+packages/tools/release-plugin-repo-cli.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

.yarnrc.yml

@@ -0,0 +1,9 @@
+nmHoistingLimits: workspaces
+
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-3.1.1.cjs

Assets/WebsiteAssets/css/site.css

@@ -18,10 +18,18 @@ a {
 	text-decoration: none;
 }
 
+ol, ul {
+	padding-left: 1rem;
+}
+
+.row > ul, ol {
+	margin-left: 1rem;
+}
+
 #main-container {
 	position: relative;
 	min-height: 100vh;
-	padding-bottom: 225px;
+	padding-bottom: 127px; /* Needs to be the height of the footer */
 }
 
 .help-page-container img {
@@ -180,6 +188,11 @@ h2 {
 	padding-bottom: 0.5em;
 }
 
+h3 {
+	font-size: 1.3em;
+	margin-bottom: 0.8rem;
+}
+
 .front-page h1 {
 	font-size: 3em;
 }
@@ -510,12 +523,17 @@ 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 {
@@ -575,7 +593,7 @@ div.navbar-mobile-content a.sponsor-button {
 
 /* footer section  */
 footer {
-	padding-top: 50px;
+	padding-top: 30px;
 	padding-bottom: 30px;
 	position: absolute;
 	bottom: 0;
@@ -586,6 +604,7 @@ footer a,
 footer p {
 	color: #90b1d9;
 	text-decoration: none;
+	margin-bottom: 0;
 }
 
 footer a:hover {
@@ -609,6 +628,53 @@ 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
@@ -671,7 +737,7 @@ footer .right-links a {
 	#main-container {
 		position: relative;
 		min-height: 100vh;
-		padding-bottom: 260px;
+		padding-bottom: 130px;
 	}
 
 	.front-page h1 {
@@ -858,7 +924,7 @@ footer .right-links a {
 
 .help-page-container {
 	padding-top: 90px;
-	padding-bottom: 50px;
+	padding-bottom: 70px;
 }
 
 .donate-links {
@@ -872,7 +938,7 @@ footer .right-links a {
 	border-radius: 20px;
 	padding: 30px 20px;
 	padding-bottom: 30px;
-	margin-bottom: 50px;
+	margin-bottom: 20px;
 	margin-top: 40px;
 }
 
@@ -897,7 +963,7 @@ footer .right-links a {
 	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: 50px;
+	padding-top: 40px;
 	color: white;
 }
 
@@ -915,6 +981,11 @@ footer .right-links a {
 	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;
@@ -957,6 +1028,7 @@ footer .right-links a {
 
 .price-row .plan-type img {
 	width: 65px;
+	margin-bottom: 0;
 }
 
 .price-row .plan-price {