Android 2.5.3

… this time with Poedit ;-)

.eslintignore

@@ -3,22 +3,15 @@ _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
@@ -47,21 +40,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 +78,9 @@ 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-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 +90,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 +114,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 +126,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 +150,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 +216,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/EncryptionConfigScreen.d.ts
-packages/app-desktop/gui/EncryptionConfigScreen.js
-packages/app-desktop/gui/EncryptionConfigScreen.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 +243,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 +258,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
@@ -315,6 +339,9 @@ 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
@@ -396,21 +423,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 +495,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
@@ -567,12 +603,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
@@ -648,6 +693,9 @@ packages/app-desktop/services/commands/stateToWhenClauseContext.js.map
 packages/app-desktop/services/commands/types.d.ts
 packages/app-desktop/services/commands/types.js
 packages/app-desktop/services/commands/types.js.map
+packages/app-desktop/services/e2ee.d.ts
+packages/app-desktop/services/e2ee.js
+packages/app-desktop/services/e2ee.js.map
 packages/app-desktop/services/plugins/PlatformImplementation.d.ts
 packages/app-desktop/services/plugins/PlatformImplementation.js
 packages/app-desktop/services/plugins/PlatformImplementation.js.map
@@ -684,6 +732,9 @@ 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/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -741,6 +792,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 +873,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 +915,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 +927,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 +945,30 @@ 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.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -927,6 +1005,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 +1029,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 +1065,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
@@ -1077,12 +1170,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 +1263,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 +1314,12 @@ 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_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 +1341,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
@@ -1380,6 +1506,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 +1593,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 +1629,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 +1659,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 +1764,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 +1779,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
@@ -1689,6 +1854,9 @@ 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,12 +1875,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/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
@@ -1734,9 +1911,15 @@ 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

.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/scripts/run_ci.sh

@@ -62,6 +62,13 @@ npm install
 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running tests..."
 
+	# 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

.gitignore

@@ -49,6 +49,7 @@ 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
@@ -60,6 +61,9 @@ 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-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 +73,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 +97,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 +109,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 +133,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 +199,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/EncryptionConfigScreen.d.ts
-packages/app-desktop/gui/EncryptionConfigScreen.js
-packages/app-desktop/gui/EncryptionConfigScreen.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 +226,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 +241,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
@@ -300,6 +322,9 @@ 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
@@ -381,21 +406,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 +478,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
@@ -552,12 +586,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
@@ -633,6 +676,9 @@ packages/app-desktop/services/commands/stateToWhenClauseContext.js.map
 packages/app-desktop/services/commands/types.d.ts
 packages/app-desktop/services/commands/types.js
 packages/app-desktop/services/commands/types.js.map
+packages/app-desktop/services/e2ee.d.ts
+packages/app-desktop/services/e2ee.js
+packages/app-desktop/services/e2ee.js.map
 packages/app-desktop/services/plugins/PlatformImplementation.d.ts
 packages/app-desktop/services/plugins/PlatformImplementation.js
 packages/app-desktop/services/plugins/PlatformImplementation.js.map
@@ -669,6 +715,9 @@ 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/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map
@@ -726,6 +775,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 +856,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 +898,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 +910,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 +928,30 @@ 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.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -912,6 +988,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 +1012,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 +1048,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
@@ -1062,12 +1153,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 +1246,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 +1297,12 @@ 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_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 +1324,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
@@ -1365,6 +1489,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 +1576,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 +1612,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 +1642,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 +1747,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 +1762,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
@@ -1674,6 +1837,9 @@ 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,12 +1858,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/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
@@ -1719,9 +1894,15 @@ 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

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 {
@@ -575,7 +583,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 +594,7 @@ footer a,
 footer p {
 	color: #90b1d9;
 	text-decoration: none;
+	margin-bottom: 0;
 }
 
 footer a:hover {
@@ -609,6 +618,35 @@ 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;
+}
+
 /*****************************************************************
  IN THE PRESS
  The "In the press" section height needs to be adjusted as the
@@ -671,7 +709,7 @@ footer .right-links a {
 	#main-container {
 		position: relative;
 		min-height: 100vh;
-		padding-bottom: 260px;
+		padding-bottom: 130px;
 	}
 
 	.front-page h1 {
@@ -858,7 +896,7 @@ footer .right-links a {
 
 .help-page-container {
 	padding-top: 90px;
-	padding-bottom: 50px;
+	padding-bottom: 70px;
 }
 
 .donate-links {
@@ -872,7 +910,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 +935,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 +953,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 +1000,7 @@ footer .right-links a {
 
 .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="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
+		<link rel="stylesheet" href="{{{assetUrls.css.fontawesome}}}">
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
@@ -29,7 +29,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
+		<link rel="stylesheet" href="{{{assetUrls.css.site}}}" as="style" />
 		<title>Joplin</title>
 	</head>
 	<body class="front-page website-env-{{env}}">
@@ -368,40 +368,7 @@
 				</div>
 			</div>
 
-			<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>
+			{{> footer}}
 		</div>
 
 		<script
@@ -409,7 +376,7 @@
 			rel="preload"
 			as="script"
 		></script>
-		<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
+		<script src="{{{assetUrls.js.script}}}"></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="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
+		<link rel="stylesheet" href="{{{assetUrls.css.fontawesome}}}">
 		<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="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
+		<link rel="stylesheet" href="{{{assetUrls.css.site}}}" as="style" />
 		<title>{{pageTitle}}</title>
 
 		<script
@@ -75,41 +75,11 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 				</div>
 			</div>
 
-			<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>
+			
+			{{> footer}}
 		</div>
 
-		<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
+		<script src="{{{assetUrls.js.script}}}"></script>
 
 		{{> analytics}}
 	</body>

Assets/WebsiteAssets/templates/partials/footer.mustache

@@ -0,0 +1,27 @@
+<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://discordapp.com/invite/d2HMPwE" 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/plans.mustache

@@ -6,7 +6,7 @@
 					Joplin Cloud <span class="frame-bg frame-bg-yellow">plans</span>
 				</h1>
 				<p class="text-center sub-title">
-					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.
+					<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.
 				</p>
 			</div>
 		</div>
@@ -45,6 +45,8 @@
 			{{#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">
@@ -57,7 +59,7 @@
 	<script>
 		const urlQuery = new URLSearchParams(location.search);
 		let subscriptionPeriod = 'monthly';
-		var stripe = Stripe('{{{stripeConfig.publishableKey}}}');
+		const stripe = Stripe('{{{stripeConfig.publishableKey}}}');
 
 		let checkoutSessionUser = null;
 
@@ -80,9 +82,9 @@
 		}
 
 		var createCheckoutSession = function(priceId) {
-			const coupon = urlQuery.get('coupon') || '';
+			const promotionCode = urlQuery.get('promo') || '';
 
-			console.info('Creating Stripe session for price:', priceId, 'Coupon:', coupon);
+			console.info('Creating Stripe session for price:', priceId, 'Promotion code:', promotionCode);
 
 			return fetch("{{{stripeConfig.webhookBaseUrl}}}/stripe/createCheckoutSession", {
 				method: "POST",
@@ -90,8 +92,8 @@
 					"Content-Type": "application/json"
 				},
 				body: JSON.stringify({
-					priceId: priceId,
-					coupon: coupon,
+					priceId,
+					promotionCode,
 					email: checkoutSessionUser ? checkoutSessionUser.email : '',
 				})
 			}).then(async function(result) {

BUILD.md

@@ -18,7 +18,7 @@ There are also a few forks of existing packages under the "fork-*" name.
 
 ## Required dependencies
 
-- Install node 10+ - https://nodejs.org/en/
+- Install node 14+ - https://nodejs.org/en/
 - macOS: Install Cocoapods - `brew install cocoapods`
 - Windows: Install Windows Build Tools - `npm install -g windows-build-tools --vs2015`
 - Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev python rsync`
@@ -45,7 +45,7 @@ You can also run it under WSL 2. To do so, [follow these instructions](https://w
 
 ## Testing the Mobile application
 
-First you need to setup React Native to build projects with native code. For this, follow the instructions on the [Get Started](https://facebook.github.io/react-native/docs/getting-started.html) tutorial, in the "React Native CLI Quickstart" tab.
+First you need to setup React Native to build projects with native code. For this, follow the instructions in the [Setting up the development environment](https://reactnative.dev/docs/environment-setup) tutorial, in the "React Native CLI Quickstart" tab.
 
 Then, for **Android**:
 

CONTRIBUTING.md

@@ -31,12 +31,14 @@ Joplin is available in multiple languages thanks to the help of its users. You c
 
 If you want to start contributing to the project's code, please follow these guidelines before creating a pull request: 
 
+- Explain WHY you want to add this change. Explain it inside the pull request and you may link to an issue for additional information, but the PR should gives a clear overview of why you want to add this.
 - Bug fixes are always welcome. Start by reviewing the [list of bugs](https://github.com/laurent22/joplin/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
 - A good way to easily start contributing is to pick and work on a [good first issue](https://github.com/laurent22/joplin/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22). We try to make these issues as clear as possible and provide basic info on how the code should be changed, and if something is unclear feel free to ask for more information on the issue.
 - Before adding a new feature, ask about it in the [Github Issue Tracker](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue) or the [Joplin Forum](https://discourse.joplinapp.org/), or check if existing discussions exist to make sure the new functionality is desired.
 - **Changes that will consist in more than 50 lines of code should be discussed the [Joplin Forum](https://discourse.joplinapp.org/)**, so that you don't spend too much time implementing something that might not be accepted.
 - All the applications share the same backend (database, synchronisation, settings, models, business logic, etc.) so if you change something in the backend in one app, makes sure it still work in the other apps. Usually it does, but keep this in mind.
 - Pull requests that make many changes using an automated tool, like for spell fixing, styling, etc. will not be accepted. An exception would be if the changes have been discussed in the forum and someone has agreed to review **and test** the pull request.
+- Pull requests that make address multiple issues will most likely stall and eventually be closed. This is because we might be fine with one of the changes but not with others and untangling that kind of pull request is too much hassle both for maintainers and the person who submitted it. So most of the time someone gives up and the PR gets closed. So please keep the pull request focused on one issue.
 
 Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/dev/BUILD.md) for more details.
 

Dockerfile.server

@@ -1,9 +1,11 @@
 # https://versatile.nl/blog/deploying-lerna-web-apps-with-docker
 
-FROM node:16
+FROM node:16-bullseye
 
-RUN apt-get update
-RUN apt-get --yes install vim
+RUN apt-get update \
+    && apt-get install -y \
+    python \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN echo "Node: $(node --version)"
 RUN echo "Npm: $(npm --version)"

Joplin_install_and_update.sh

@@ -120,7 +120,7 @@ fi
 
 # Get the latest version to download
 if [[ "$INCLUDE_PRE_RELEASE" == true ]]; then
-  RELEASE_VERSION=$(wget -qO - "https://api.github.com/repos/laurent22/joplin/releases" | grep -Po '"tag_name": ?"v\K.*?(?=")' | head -1)
+  RELEASE_VERSION=$(wget -qO - "https://api.github.com/repos/laurent22/joplin/releases" | grep -Po '"tag_name": ?"v\K.*?(?=")' | sort -rV | head -1)
 else
   RELEASE_VERSION=$(wget -qO - "https://api.github.com/repos/laurent22/joplin/releases/latest" | grep -Po '"tag_name": ?"v\K.*?(?=")')
 fi
@@ -137,8 +137,8 @@ fi
 #-----------------------------------------------------
 print 'Downloading Joplin...'
 TEMP_DIR=$(mktemp -d)
-wget -O ${TEMP_DIR}/Joplin.AppImage https://github.com/laurent22/joplin/releases/download/v${RELEASE_VERSION}/Joplin-${RELEASE_VERSION}.AppImage
-wget -O ${TEMP_DIR}/joplin.png https://joplinapp.org/images/Icon512.png
+wget -O "${TEMP_DIR}/Joplin.AppImage" "https://github.com/laurent22/joplin/releases/download/v${RELEASE_VERSION}/Joplin-${RELEASE_VERSION}.AppImage"
+wget -O "${TEMP_DIR}/joplin.png" https://joplinapp.org/images/Icon512.png
 
 #-----------------------------------------------------
 print 'Installing Joplin...'
@@ -149,7 +149,7 @@ rm -f ~/.joplin/*.AppImage ~/.local/share/applications/joplin.desktop ~/.joplin/
 mkdir -p ~/.joplin/
 
 # Download the latest version
-mv ${TEMP_DIR}/Joplin.AppImage ~/.joplin/Joplin.AppImage
+mv "${TEMP_DIR}/Joplin.AppImage" ~/.joplin/Joplin.AppImage
 
 # Gives execution privileges
 chmod +x ~/.joplin/Joplin.AppImage
@@ -159,7 +159,7 @@ print "${COLOR_GREEN}OK${COLOR_RESET}"
 #-----------------------------------------------------
 print 'Installing icon...'
 mkdir -p ~/.local/share/icons/hicolor/512x512/apps
-mv ${TEMP_DIR}/joplin.png ~/.local/share/icons/hicolor/512x512/apps/joplin.png
+mv "${TEMP_DIR}/joplin.png" ~/.local/share/icons/hicolor/512x512/apps/joplin.png
 print "${COLOR_GREEN}OK${COLOR_RESET}"
 
 # Detect desktop environment
@@ -171,19 +171,24 @@ else
 fi
 DESKTOP=${DESKTOP,,}  # convert to lower case
 
-# Detect distribution environment
-DISTVER=$(lsb_release -is) && DISTVER=$DISTVER$(lsb_release -rs)
-DISTCODENAME=$(lsb_release -cs)
-#-----------------------------------------------------
 echo 'Create Desktop icon...'
-# Check for "The SUID sandbox helper binary was found, but is not configured correctly" problem.
-# It is present in Debian 10 Buster. A (temporary) patch will be applied at .desktop file
-# Linux Mint 4 Debbie is based on Debian 10 and requires the same param handling.
-if [ "$DISTVER" = "Debian10" ] || [ "$DISTVER" = "Linuxmint4" ] && [ "$DISTCODENAME" = "debbie" ]
-then
-  SANDBOXPARAM=" --no-sandbox"
-else
-  SANDBOXPARAM=""
+
+# Detect distribution environment, and apply --no-sandbox fix
+SANDBOXPARAM=""
+# lsb_release isn't available on some platforms (e.g. opensuse)
+# The equivalent of lsb_release in OpenSuse is the file /usr/lib/os-release
+if command -v lsb_release &> /dev/null; then
+  DISTVER=$(lsb_release -is) && DISTVER=$DISTVER$(lsb_release -rs)
+  DISTCODENAME=$(lsb_release -cs)
+  DISTMAJOR=$(lsb_release -rs|cut -d. -f1)
+  #-----------------------------------------------------
+  # Check for "The SUID sandbox helper binary was found, but is not configured correctly" problem.
+  # It is present in Debian 1X. A (temporary) patch will be applied at .desktop file
+  # Linux Mint 4 Debbie is based on Debian 10 and requires the same param handling.
+  if [[ $DISTVER =~ Debian1. ]] || [ "$DISTVER" = "Linuxmint4" ] && [ "$DISTCODENAME" = "debbie" ] || [ "$DISTVER" = "CentOS" ] && [[ "$DISTMAJOR" =~ 6|7 ]]
+  then
+    SANDBOXPARAM="--no-sandbox"
+  fi
 fi
 
 # Initially only desktop environments that were confirmed to use desktop files stored in
@@ -201,7 +206,21 @@ then
 
     # On some systems this directory doesn't exist by default
     mkdir -p ~/.local/share/applications
-    echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nComment=Joplin for Desktop\nExec=${HOME}/.joplin/Joplin.AppImage${SANDBOXPARAM}\nIcon=joplin\nStartupWMClass=Joplin\nType=Application\nCategories=Office;" >> ~/.local/share/applications/appimagekit-joplin.desktop
+    
+    # Tabs specifically, and not spaces, are needed for indentation with Bash heredocs
+    cat >> ~/.local/share/applications/appimagekit-joplin.desktop <<-EOF
+	[Desktop Entry]
+	Encoding=UTF-8
+	Name=Joplin
+	Comment=Joplin for Desktop
+	Exec=${HOME}/.joplin/Joplin.AppImage ${SANDBOXPARAM}
+	Icon=joplin
+	StartupWMClass=Joplin
+	Type=Application
+	Categories=Office;
+	MimeType=x-scheme-handler/joplin;
+	EOF
+    
     # Update application icons
     [[ `command -v update-desktop-database` ]] && update-desktop-database ~/.local/share/applications && update-desktop-database ~/.local/share/icons
     print "${COLOR_GREEN}OK${COLOR_RESET}"
@@ -217,7 +236,7 @@ fi
 print "${COLOR_GREEN}Joplin version${COLOR_RESET} ${RELEASE_VERSION} ${COLOR_GREEN}installed.${COLOR_RESET}"
 
 # Record version
-echo $RELEASE_VERSION > ~/.joplin/VERSION
+echo "$RELEASE_VERSION" > ~/.joplin/VERSION
 
 #-----------------------------------------------------
 if [[ "$SHOW_CHANGELOG" == true ]]; then
@@ -227,5 +246,5 @@ fi
 
 #-----------------------------------------------------
 print "Cleaning up..."
-rm -rf $TEMP_DIR
+rm -rf "$TEMP_DIR"
 print "${COLOR_GREEN}OK${COLOR_RESET}"

README.md

@@ -16,17 +16,17 @@ The application is available for Windows, Linux, macOS, Android and iOS (the ter
 
 # Installation
 
-Three types of applications are available: for the **desktop** (Windows, macOS and Linux), for **mobile** (Android and iOS) and for **terminal** (Windows, macOS, Linux and FreeBSD). All applications have similar user interfaces and can synchronise with each other.
+Three types of applications are available: for **desktop** (Windows, macOS and Linux), for **mobile** (Android and iOS) and for **terminal** (Windows, macOS, Linux and FreeBSD). All the applications have similar user interfaces and can synchronise with each other.
 
 ## Desktop applications
 
 Operating System | Download
 ---|---
-Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-Setup-2.1.9.exe'><img alt='Get it on Windows' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeWindows.png'/></a>
-macOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.dmg'><img alt='Get it on macOS' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeMacOS.png'/></a>
-Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.AppImage'><img alt='Get it on Linux' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeLinux.png'/></a>
+Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-Setup-2.4.12.exe'><img alt='Get it on Windows' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeWindows.png'/></a>
+macOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.dmg'><img alt='Get it on macOS' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeMacOS.png'/></a>
+Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.AppImage'><img alt='Get it on Linux' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeLinux.png'/></a>
 
-**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
+**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
 
 **On Linux**, the recommended way is to use the following installation script as it will handle the desktop icon too:
 
@@ -36,7 +36,7 @@ Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Jo
 
 Operating System | Download | Alt. Download
 ---|---|---
-Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.1.4/joplin-v2.1.4.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.1.4/joplin-v2.1.4-32bit.apk)
+Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.4.3/joplin-v2.4.3.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.4.3/joplin-v2.4.3-32bit.apk)
 iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application
@@ -64,7 +64,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 # Sponsors
 
 <!-- SPONSORS-ORG -->
-<a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-github&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a>
+<a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-github&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a>
 <!-- SPONSORS-ORG -->
 
 * * *
@@ -73,10 +73,11 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 |       |       |       |       |
 | :---: | :---: | :---: | :---: |
 | <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/3061769?s=96&v=4"/></br>[c-nagy](https://github.com/c-nagy) | <img width="50" src="https://avatars2.githubusercontent.com/u/70780798?s=96&v=4"/></br>[cabottech](https://github.com/cabottech) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/4862947?s=96&v=4"/></br>[chrootlogin](https://github.com/chrootlogin) | <img width="50" src="https://avatars2.githubusercontent.com/u/82579431?s=96&v=4"/></br>[clmntsl](https://github.com/clmntsl) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) | <img width="50" src="https://avatars2.githubusercontent.com/u/1439535?s=96&v=4"/></br>[fbloise](https://github.com/fbloise) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/38898566?s=96&v=4"/></br>[h4sh5](https://github.com/h4sh5) | <img width="50" src="https://avatars2.githubusercontent.com/u/37297218?s=96&v=4"/></br>[Jesssullivan](https://github.com/Jesssullivan) | <img width="50" src="https://avatars2.githubusercontent.com/u/1248504?s=96&v=4"/></br>[joesfer](https://github.com/joesfer) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) | <img width="50" src="https://avatars2.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) | <img width="50" src="https://avatars2.githubusercontent.com/u/1168659?s=96&v=4"/></br>[nicholashead](https://github.com/nicholashead) | <img width="50" src="https://avatars2.githubusercontent.com/u/5782817?s=96&v=4"/></br>[piccobit](https://github.com/piccobit) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/47742?s=96&v=4"/></br>[ravenscroftj](https://github.com/ravenscroftj) | <img width="50" src="https://avatars2.githubusercontent.com/u/73081837?s=96&v=4"/></br>[thismarty](https://github.com/thismarty) | <img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br>[thomasbroussard](https://github.com/thomasbroussard) |       |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/4862947?s=96&v=4"/></br>[chrootlogin](https://github.com/chrootlogin) | <img width="50" src="https://avatars2.githubusercontent.com/u/82579431?s=96&v=4"/></br>[clmntsl](https://github.com/clmntsl) | <img width="50" src="https://avatars2.githubusercontent.com/u/808091?s=96&v=4"/></br>[cuongtransc](https://github.com/cuongtransc) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/1439535?s=96&v=4"/></br>[fbloise](https://github.com/fbloise) | <img width="50" src="https://avatars2.githubusercontent.com/u/38898566?s=96&v=4"/></br>[h4sh5](https://github.com/h4sh5) | <img width="50" src="https://avatars2.githubusercontent.com/u/3266447?s=96&v=4"/></br>[iamwillbar](https://github.com/iamwillbar) | <img width="50" src="https://avatars2.githubusercontent.com/u/37297218?s=96&v=4"/></br>[Jesssullivan](https://github.com/Jesssullivan) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/1248504?s=96&v=4"/></br>[joesfer](https://github.com/joesfer) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) | <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) | <img width="50" src="https://avatars2.githubusercontent.com/u/1168659?s=96&v=4"/></br>[nicholashead](https://github.com/nicholashead) | <img width="50" src="https://avatars2.githubusercontent.com/u/5782817?s=96&v=4"/></br>[piccobit](https://github.com/piccobit) | <img width="50" src="https://avatars2.githubusercontent.com/u/47742?s=96&v=4"/></br>[ravenscroftj](https://github.com/ravenscroftj) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/73081837?s=96&v=4"/></br>[thismarty](https://github.com/thismarty) | <img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br>[thomasbroussard](https://github.com/thomasbroussard) |       |       |
 <!-- SPONSORS-GITHUB -->
 
 <!-- TOC -->
@@ -97,6 +98,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 	- [What is a conflict?](https://github.com/laurent22/joplin/blob/dev/readme/conflict.md)
 	- [How to enable debug mode](https://github.com/laurent22/joplin/blob/dev/readme/debugging.md)
 	- [About the Rich Text editor limitations](https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md)
+	- [External links](https://github.com/laurent22/joplin/blob/dev/readme/external_links.md)
 	- [FAQ](https://github.com/laurent22/joplin/blob/dev/readme/faq.md)
 
 - Joplin Cloud
@@ -474,11 +476,11 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 Name | Description
 --- | ---
 [Support Forum](https://discourse.joplinapp.org/) | This is the main place for general discussion about Joplin, user support, software development questions, and to discuss new features. Also where the latest beta versions are released and discussed.
-[Sub-reddit](https://www.reddit.com/r/joplinapp/) | Also a good place to get help
-[Discord server](https://discordapp.com/invite/d2HMPwE) | Our chat server
-[Patreon page](https://www.patreon.com/joplin) |The latest news are often posted there
-[Mastodon feed](https://mastodon.social/@joplinapp) | Follow us on Mastodon
 [Twitter feed](https://twitter.com/joplinapp) | Follow us on Twitter
+[Mastodon feed](https://mastodon.social/@joplinapp) | Follow us on Mastodon
+[Patreon page](https://www.patreon.com/joplin) |The latest news are often posted there
+[Discord server](https://discordapp.com/invite/d2HMPwE) | Our chat server
+[Sub-reddit](https://www.reddit.com/r/joplinapp/) | Also a good place to get help
 
 # Contributing
 
@@ -503,47 +505,47 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  94%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  29%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  73%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  57%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  jmontane, 2019  |  99%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  99%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  98%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  98%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [Atalanttore](mailto:atalanttore@googlemail.com)  |  99%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  56%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/gb.png" width="16px"/>  |  English (United Kingdom)  |  [en_GB](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po)  |    |  100%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/us.png" width="16px"/>  |  English (United States of America)  |  [en_US](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po)  |    |  100%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  99%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  32%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato  |  93%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  97%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  37%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [eresytter](mailto:42007357+eresytter@users.noreply.github.com)  |  91%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Manuel Tassi](mailto:mannivuwiki@gmail.com)  |  98%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  87%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  90%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  93%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  75%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  70%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [konhi](mailto:hello.konhi@gmail.com)  |  93%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Nicolas Suzuki](mailto:nicolas.suzuki@pm.me)  |  98%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  93%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  65%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  94%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  98%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  44%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/vi.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  72%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  99%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  92%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  95%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  93%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  83%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [南宫小骏](mailto:jackytsu@vip.qq.com)  |  99%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Po-Chiang Chao](mailto:BobChao%29%20%28bobchao@gmail.com)  |  98%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  99%
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  98%
+<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  99%
+<img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  28%
+<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  71%
+<img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  55%
+<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  [Xavi Ivars](mailto:xavi.ivars@gmail.com)  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [marph91](mailto:martin.d@andix.de)  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  54%
+<img src="https://joplinapp.org/images/flags/country-4x3/gb.png" width="16px"/>  |  English (United Kingdom)  |  [en_GB](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po)  |    |  100%
+<img src="https://joplinapp.org/images/flags/country-4x3/us.png" width="16px"/>  |  English (United States of America)  |  [en_US](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po)  |    |  100%
+<img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  95%
+<img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  31%
+<img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Nicolas Viviani  |  100%
+<img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  36%
+<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [eresytter](mailto:42007357+eresytter@users.noreply.github.com)  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Albano Battistella](mailto:albano_battistella@hotmail.com)  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  83%
+<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  86%
+<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  90%
+<img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  Alexander Dawson  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  67%
+<img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [konhi](mailto:hello.konhi@gmail.com)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Nicolas Suzuki](mailto:nicolas.suzuki@pm.me)  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  62%
+<img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  90%
+<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  42%
+<img src="https://joplinapp.org/images/flags/country-4x3/vi.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  89%
+<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  80%
+<img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [南宫小骏](mailto:jackytsu@vip.qq.com)  |  100%
+<img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [SiderealArt](mailto:nelson22768384@gmail.com)  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  100%
+<img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  94%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Contributors

docker-compose.db-dev.yml

@@ -7,6 +7,7 @@ version: '3'
 services:
     db:
         image: postgres:13.1
+        command: postgres -c work_mem=100000
         ports:
             - "5432:5432"
         environment:

docs/api/get_started/plugins/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/api/get_started/plugins.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Getting started with plugin development | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -342,41 +347,36 @@ This should be the path to your main plugin directory, i.e. <code>path/to/your/r
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/api/overview/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/api/overview.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Extending Joplin | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -320,41 +325,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/api/references/development_mode/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/api/references/development_m
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Development mode | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -299,41 +304,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

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

@@ -69,15 +69,13 @@
 					<div class="lead">
 						<p>This is the main entry point to the Joplin API. You can access various services using the provided accessors.</p>
 					</div>
-					<p><strong>This is a beta API</strong></p>
-					<p>Please note that the plugin API is relatively new and should be considered Beta state. Besides possible bugs, what it means is that there might be necessary breaking changes from one version to the next. Whenever such change is needed, best effort will be done to:</p>
+					<p>The API is now relatively stable and in general maintaining backward compatibility is a top priority, so you shouldn&#39;t except much breakages.</p>
+					<p>If a breaking change ever becomes needed, best effort will be done to:</p>
 					<ul>
-						<li>Maintain backward compatibility;</li>
-						<li>When possible, deprecate features instead of removing them;</li>
+						<li>Deprecate features instead of removing them, so as to give you time to fix the issue;</li>
 						<li>Document breaking changes in the changelog;</li>
 					</ul>
-					<p>So if you are developing a plugin, please keep an eye on the changelog as everything will be in there with information about how to update your code. There won&#39;t be any major API rewrite or architecture changes, but possibly small tweaks like function signature change, type change, etc.</p>
-					<p>Eventually, the plugin API will be versioned to make this process smoother.</p>
+					<p>So if you are developing a plugin, please keep an eye on the changelog as everything will be in there with information about how to update your code.</p>
 				</div>
 			</section>
 			<!--

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

@@ -268,8 +268,7 @@
 							<div class="tsd-comment tsd-typography">
 								<div class="lead">
 									<p>Toggle on whether to fit the dialog size to the content or not.
-										When set to false, the dialog stretches to fill the application
-									window.</p>
+									When set to false, the dialog is set to 90vw and 80vh</p>
 								</div>
 								<dl class="tsd-comment-tags">
 									<dt>default</dt>

docs/api/references/plugin_api/globals.html

@@ -141,6 +141,7 @@
 							<h3>Variables</h3>
 							<ul class="tsd-index-list">
 								<li class="tsd-kind-variable"><a href="globals.html#logger" class="tsd-kind-icon">logger</a></li>
+								<li class="tsd-kind-variable"><a href="globals.html#registersettingallowedpluginids" class="tsd-kind-icon">register<wbr>Setting<wbr>Allowed<wbr>Plugin<wbr>Ids</a></li>
 							</ul>
 						</section>
 						<section class="tsd-index-section ">
@@ -323,6 +324,13 @@
 					<aside class="tsd-sources">
 					</aside>
 				</section>
+				<section class="tsd-panel tsd-member tsd-kind-variable">
+					<a name="registersettingallowedpluginids" class="tsd-anchor"></a>
+					<h3><span class="tsd-flag ts-flagConst">Const</span> register<wbr>Setting<wbr>Allowed<wbr>Plugin<wbr>Ids</h3>
+					<div class="tsd-signature tsd-kind-icon">register<wbr>Setting<wbr>Allowed<wbr>Plugin<wbr>Ids<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">[]</span><span class="tsd-signature-symbol"> = [&#x27;b53da1f6-868c-468d-b60c-2897a27166ac&#x27;,&#x27;com.andrejilderda.macOSTheme&#x27;,&#x27;com.export-to-ssg.aman-d-1-n-only&#x27;,&#x27;com.github.BeatLink.joplin-plugin-untagged&#x27;,&#x27;com.github.joplin.kanban&#x27;,&#x27;com.github.marc0l92.joplin-plugin-jira-issue&#x27;,&#x27;com.github.uphy.PlantUmlPlugin&#x27;,&#x27;com.gitlab.BeatLink.joplin-plugin-repeating-todos&#x27;,&#x27;com.joplin_plugin.nlr&#x27;,&#x27;com.lki.homenote&#x27;,&#x27;com.plugin.randomNotePlugin&#x27;,&#x27;com.shantanugoel.JoplinCMLineNumbersPlugin&#x27;,&#x27;com.whatever.inline-tags&#x27;,&#x27;com.whatever.quick-links&#x27;,&#x27;com.xUser5000.bibtex&#x27;,&#x27;cx.evermeet.tessus.menu-shortcut-toolbar&#x27;,&#x27;fd117a99-b165-4824-893c-5825439a842d&#x27;,&#x27;io.github.jackgruber.backup&#x27;,&#x27;io.github.jackgruber.combine-notes&#x27;,&#x27;io.github.jackgruber.copytags&#x27;,&#x27;io.github.jackgruber.hotfolder&#x27;,&#x27;io.github.jackgruber.note-overview&#x27;,&#x27;io.treymo.LinkGraph&#x27;,&#x27;joplin-insert-date&#x27;,&#x27;joplin-plugin-conflict-resolution&#x27;,&#x27;joplin.plugin.ambrt.backlinksToNote&#x27;,&#x27;joplin.plugin.ambrt.convertToNewNote&#x27;,&#x27;joplin.plugin.ambrt.copyNoteLink&#x27;,&#x27;joplin.plugin.ambrt.embedSearch&#x27;,&#x27;joplin.plugin.ambrt.fold-cm&#x27;,&#x27;joplin.plugin.ambrt.goToItem&#x27;,&#x27;joplin.plugin.anki-sync&#x27;,&#x27;joplin.plugin.benji.favorites&#x27;,&#x27;joplin.plugin.benji.persistentLayout&#x27;,&#x27;joplin.plugin.benji.quick-move&#x27;,&#x27;joplin.plugin.forcewake.tags-generator&#x27;,&#x27;joplin.plugin.note.tabs&#x27;,&#x27;joplin.plugin.quick.html.tags&#x27;,&#x27;joplin.plugin.spoiler.cards&#x27;,&#x27;joplin.plugin.templates&#x27;,&#x27;net.rmusin.joplin-table-formatter&#x27;,&#x27;net.rmusin.resource-search&#x27;,&#x27;org.joplinapp.plugins.AbcSheetMusic&#x27;,&#x27;org.joplinapp.plugins.admonition&#x27;,&#x27;org.joplinapp.plugins.ToggleSidebars&#x27;,&#x27;osw.joplin.markdowncalc&#x27;,&#x27;outline&#x27;,&#x27;plugin.azamahJunior.note-statistics&#x27;,&#x27;plugin.calebjohn.MathMode&#x27;,&#x27;plugin.calebjohn.rich-markdown&#x27;,]</span></div>
+					<aside class="tsd-sources">
+					</aside>
+				</section>
 			</section>
 			<section class="tsd-panel-group tsd-member-group ">
 				<h2>Functions</h2>

docs/api/references/plugin_loading_rules/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/api/references/plugin_loadin
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Plugin Loading Rules | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -305,41 +310,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/api/references/plugin_manifest/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/api/references/plugin_manife
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Plugin Manifest | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -375,41 +380,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/api/references/plugin_theming/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/api/references/plugin_themin
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Plugin theming | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -335,41 +340,36 @@ These include:</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/api/references/rest_api/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/api/references/rest_api.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin Data API | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -950,6 +955,61 @@ async function fetchAllNotes() {
 <p>Deletes the tag with ID :id</p>
 <h2>DELETE /tags/:id/notes/:note_id<a name="delete-tags-id-notes-note-id" href="#delete-tags-id-notes-note-id" class="heading-anchor">🔗</a></h2>
 <p>Remove the tag from the note.</p>
+<h1>Events<a name="events" href="#events" class="heading-anchor">🔗</a></h1>
+<p>This end point can be used to retrieve the latest note changes. Currently only note changes are tracked.</p>
+<h2>Properties<a name="properties-4" href="#properties-4" class="heading-anchor">🔗</a></h2>
+<table class="table">
+<thead>
+<tr>
+<th>Name</th>
+<th>Type</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>id</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>item_type</td>
+<td>int</td>
+<td>The item type (see table above for the list of item types)</td>
+</tr>
+<tr>
+<td>item_id</td>
+<td>text</td>
+<td>The item ID</td>
+</tr>
+<tr>
+<td>type</td>
+<td>int</td>
+<td>The type of change - either 1 (created), 2 (updated) or 3 (deleted)</td>
+</tr>
+<tr>
+<td>created_time</td>
+<td>int</td>
+<td>When the event was generated</td>
+</tr>
+<tr>
+<td>source</td>
+<td>int</td>
+<td>Unused</td>
+</tr>
+<tr>
+<td>before_change_item</td>
+<td>text</td>
+<td>Unused</td>
+</tr>
+</tbody>
+</table>
+<h2>GET /events<a name="get-events" href="#get-events" class="heading-anchor">🔗</a></h2>
+<p>Returns a paginated list of recent events. A <code>cursor</code> property should be provided, which tells from what point in time the events should be returned. The API will return a <code>cursor</code> property, to tell from where to resume retrieving events, as well as an <code>has_more</code> (tells if more changes can be retrieved) and <code>items</code> property, which will contain the list of events. Events are kept for up to 90 days.</p>
+<p>If no <code>cursor</code> property is provided, the API will respond with the latest change ID. That can be used to retrieve future events later on.</p>
+<p>The results are paginated so will need to may multiple calls to retrieve all the events. Use the <code>has_more</code> property to know if more can be retrieved.</p>
+<h2>GET /events/:id<a name="get-events-id" href="#get-events-id" class="heading-anchor">🔗</a></h2>
+<p>Returns the event with the given ID.</p>
 
 								<div class="bottom-links">
 									<a href="https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md">
@@ -961,41 +1021,36 @@ async function fetchAllNotes() {
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/api/tutorials/toc_plugin/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/api/tutorials/toc_plugin.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Creating a table of content plugin | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -569,41 +574,36 @@ document.addEventListener('click', event =&gt; {
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20180621-182112/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20180621-182112.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Web Clipper now available on Firefox and Chrome | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -303,41 +308,36 @@ published_at: 2018-06-21T17:21:12.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20180906-111039/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20180906-111039.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>New iOS release with improved attachment support | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -304,41 +309,36 @@ published_at: 2018-09-06T10:10:39.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20180916-210431/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20180916-210431.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Note properties in desktop application | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -303,41 +308,36 @@ published_at: 2018-09-16T20:04:31.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20180929-121053/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20180929-121053.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>New release and many bug fixes | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -303,41 +308,36 @@ published_at: 2018-09-29T11:10:53.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20181004-091123/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20181004-091123.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin and Hacktobertfest 2018 🎃 | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -305,41 +310,36 @@ published_at: 2018-10-04T08:11:23.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20181101-174335/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20181101-174335.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Hacktoberfest has now ended | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -308,41 +313,36 @@ published_at: 2018-11-01T17:43:35.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20181213-173459/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20181213-173459.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin is now featured on PrivacyTools.io | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -306,41 +311,36 @@ published_at: 2018-12-13T17:34:59.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20190130-230218/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20190130-230218.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>New search engine in Joplin | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -306,41 +311,36 @@ published_at: 2019-01-30T23:02:18.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20190404-074157/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20190404-074157.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Markdown plugins and Goto Anything | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -305,41 +310,36 @@ published_at: 2019-04-04T06:41:57.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20190424-112410/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20190424-112410.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>The Joplin forum is one year old | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -305,41 +310,36 @@ published_at: 2019-04-24T10:24:10.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20190523-231026/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20190523-231026.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Note history now in Joplin | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -299,7 +304,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 <p>To restore a note, simply click on the &quot;Restore&quot; button. The old version of the note will be copied in a folder called &quot;Restored Notes&quot;. The current version of the note will not be replaced or modified.</p>
 <p><img src="images/20190523-231026_1.png" alt=""></p>
 <h3>How to configure the note history feature?<a name="how-to-configure-the-note-history-feature" href="#how-to-configure-the-note-history-feature" class="heading-anchor">🔗</a></h3>
-<p>Additional options are available in the &quot;Note History&quot; section of the configuration screen. It is possible to enable/disable the note history feature. It is also possible to specify for how long the history of a note should be kept (by default, for 90 days).</p>
+<p>Additional options are available in the &quot;Note History&quot; section of the <a href="/config_screen/">Configuration screen</a>. It is possible to enable/disable the note history feature. It is also possible to specify for how long the history of a note should be kept (by default, for 90 days).</p>
 <p>IMPORTANT: Please note that since all the revisions are synced across all devices, it means these settings are kind of global. So for example, if on one device you set it to keep revisions for 30 days, and on another to 100 days, the revisions older than 30 days will be deleted, and then this deletion will be synced. So in practice it means revisions are kept for whatever is the minimum number of days as set on any of the devices. In that particular case, the 100 days setting will be essentially ignored, and only the 30 days one will apply.</p>
 <hr>
 <p>url: <a href="https://www.patreon.com/posts/note-history-now-27083082">https://www.patreon.com/posts/note-history-now-27083082</a><br>
@@ -315,41 +320,36 @@ published_at: 2019-05-23T22:10:26.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20190611-000711/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20190611-000711.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Changing attachment download behaviour to save disk space | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -305,41 +310,36 @@ published_at: 2019-06-10T23:07:11.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20190613-202613/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20190613-202613.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Customising your notes with the help of the development tools and CSS | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -305,41 +310,36 @@ published_at: 2019-06-13T19:26:13.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20190814-225957/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20190814-225957.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin now supports Fountain screenwriting markup language | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -314,41 +319,36 @@ published_at: 2019-08-14T21:59:57.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20190925-000254/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20190925-000254.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>New icon for Joplin! | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -319,41 +324,36 @@ published_at: 2019-09-24T23:02:54.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20190929-152834/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20190929-152834.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Hacktoberfest 2019 is coming soon! | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -312,41 +317,36 @@ published_at: 2019-09-29T14:28:34.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20191012-233121/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20191012-233121.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Support for chemical equations using mhchem for Katex | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -312,41 +317,36 @@ published_at: 2019-10-12T22:31:21.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20191014-165136/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20191014-165136.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>New Joplin icon, second round | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -304,41 +309,36 @@ published_at: 2019-10-14T15:51:36.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20191101-131852/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20191101-131852.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Hacktoberfest 2019 has now ended 🎃 | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -308,41 +313,36 @@ published_at: 2019-11-01T13:18:52.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20191117-183855/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20191117-183855.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>And the winner is... | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -313,41 +318,36 @@ published_at: 2019-11-17T18:38:55.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20191118-072700/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20191118-072700.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin is looking into joining Google Summer of Code in 2020 | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -311,41 +316,36 @@ published_at: 2019-11-18T07:27:00.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20200220-190804/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20200220-190804.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>GSoC 2020: Joplin has been accepted as a mentor organization! | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -303,41 +308,36 @@ published_at: 2020-02-20T19:08:04.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20200301-125055/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20200301-125055.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Large desktop update coming soon | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -319,41 +324,36 @@ published_at: 2020-03-01T12:50:55.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20200314-001555/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20200314-001555.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Experimental WYSIWYG editor in Joplin | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -313,41 +318,36 @@ published_at: 2020-03-14T00:15:55.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/blog/20200406-224254/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/blog/20200406-224254.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin informal encryption and security audit results | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -331,41 +336,36 @@ published_at: 2020-04-06T21:42:54.000+00:00</p>
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/build_troubleshooting/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/build_troubleshooting.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Desktop application | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -338,41 +343,36 @@ pod install
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/changelog/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/changelog.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin changelog | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -286,6 +291,128 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin changelog<a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.5.4">v2.5.4</a> (Pre-release) - 2021-10-19T10:10:54Z<a name="v2-5-4-https-github-com-laurent22-joplin-releases-tag-v2-5-4-pre-release-2021-10-19t10-10-54z" href="#v2-5-4-https-github-com-laurent22-joplin-releases-tag-v2-5-4-pre-release-2021-10-19t10-10-54z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for public-private key pairs and improved master password support (<a href="https://github.com/laurent22/joplin/issues/5438">#5438</a>)</li>
+<li>New: Add Markdown + Front Matter exporter/importer (<a href="https://github.com/laurent22/joplin/issues/5465">#5465</a>) (<a href="https://github.com/laurent22/joplin/issues/5224">#5224</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>New: Add support for callback URLs (<a href="https://github.com/laurent22/joplin/issues/5416">#5416</a>) (<a href="https://github.com/laurent22/joplin/issues/5168">#5168</a> by Roman Musin)</li>
+<li>Improved: Allows a shared notebook recipient to leave the notebook (7354548)</li>
+<li>Improved: Ensure that shared notebook children are not deleted when shared, unshared and shared again, and a conflict happens (ccf9882)</li>
+<li>Improved: Improved share error handling (9bff2d1)</li>
+<li>Improved: Laggy scrolling in Markdown viewer (<a href="https://github.com/laurent22/joplin/issues/5496">#5496</a>) (<a href="https://github.com/laurent22/joplin/issues/4827">#4827</a> by Kenichi Kobayashi)</li>
+<li>Improved: Mentioned on share dialog that it may take a few minutes for all notes to appear on the recipient device (852c6f2)</li>
+<li>Fixed: Bright background around code block insertion dialog in dark mode (<a href="https://github.com/laurent22/joplin/issues/5491">#5491</a>) (<a href="https://github.com/laurent22/joplin/issues/5310">#5310</a> by <a href="https://github.com/Rishabhraghwendra18">@Rishabhraghwendra18</a>)</li>
+<li>Fixed: Certain attachments were not being automatically deleted (<a href="https://github.com/laurent22/joplin/issues/932">#932</a>)</li>
+<li>Fixed: Exclude disabled commands from Goto Anything (<a href="https://github.com/laurent22/joplin/issues/5421">#5421</a>)</li>
+<li>Fixed: Fixed running out of memory when importing large ENEX files (<a href="https://github.com/laurent22/joplin/issues/5543">#5543</a>)</li>
+<li>Fixed: Fixed share dialog button sizes (1fee83d)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.12">v2.4.12</a> - 2021-10-13T17:24:34Z<a name="v2-4-12-https-github-com-laurent22-joplin-releases-tag-v2-4-12-2021-10-13t17-24-34z" href="#v2-4-12-https-github-com-laurent22-joplin-releases-tag-v2-4-12-2021-10-13t17-24-34z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fixed running out of memory when importing large ENEX files (<a href="https://github.com/laurent22/joplin/issues/5543">#5543</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.5.1">v2.5.1</a> (Pre-release) - 2021-10-02T09:51:58Z<a name="v2-5-1-https-github-com-laurent22-joplin-releases-tag-v2-5-1-pre-release-2021-10-02t09-51-58z" href="#v2-5-1-https-github-com-laurent22-joplin-releases-tag-v2-5-1-pre-release-2021-10-02t09-51-58z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Upgrade Electron from v10 to v14 (4a7746b)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.9">v2.4.9</a> - 2021-09-29T19:08:58Z<a name="v2-4-9-https-github-com-laurent22-joplin-releases-tag-v2-4-9-2021-09-29t19-08-58z" href="#v2-4-9-https-github-com-laurent22-joplin-releases-tag-v2-4-9-2021-09-29t19-08-58z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Allow importing certain corrupted ENEX files (f144dae)</li>
+<li>Improved: Improved accepting a folder share (8ada059)</li>
+<li>Improved: Make exported HTML more readable on mobile (b1d0c15)</li>
+<li>Fixed: Fix default sync target (4b39d30)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.8">v2.4.8</a> (Pre-release) - 2021-09-22T19:01:46Z<a name="v2-4-8-https-github-com-laurent22-joplin-releases-tag-v2-4-8-pre-release-2021-09-22t19-01-46z" href="#v2-4-8-https-github-com-laurent22-joplin-releases-tag-v2-4-8-pre-release-2021-09-22t19-01-46z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fixed Sync Wizard logo images on Windows (da88475)</li>
+<li>Improved: Improved plugin search and installing new plugins from China (<a href="https://github.com/laurent22/joplin/issues/5161">#5161</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.7">v2.4.7</a> (Pre-release) - 2021-09-19T12:53:22Z<a name="v2-4-7-https-github-com-laurent22-joplin-releases-tag-v2-4-7-pre-release-2021-09-19t12-53-22z" href="#v2-4-7-https-github-com-laurent22-joplin-releases-tag-v2-4-7-pre-release-2021-09-19t12-53-22z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: MacOS: Added Cmd+Backspace shortcut to delete line (<a href="https://github.com/laurent22/joplin/issues/5478">#5478</a> by Helmut K. C. Tessarek)</li>
+<li>Improved: Display 0/0 when no search results are found in editor (<a href="https://github.com/laurent22/joplin/issues/5360">#5360</a>) (<a href="https://github.com/laurent22/joplin/issues/5299">#5299</a> by Nikhil Gautam)</li>
+<li>Improved: Do not escape content when copying from Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/5440">#5440</a>)</li>
+<li>Improved: Fire resize event whenever the layout changes (<a href="https://github.com/laurent22/joplin/issues/5344">#5344</a>) (<a href="https://github.com/laurent22/joplin/issues/5233">#5233</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Improved: Linux: Installer: properly quote variables (<a href="https://github.com/laurent22/joplin/issues/5476">#5476</a> by <a href="https://github.com/a1346054">@a1346054</a>)</li>
+<li>Improved: Support for user-data-dir flag (<a href="https://github.com/laurent22/joplin/issues/5467">#5467</a> by <a href="https://github.com/Marph">@Marph</a>)</li>
+<li>Improved: Sync deleted items first to allow fixing oversized accounts (43c594b)</li>
+<li>Improved: Update Mermaid 8.10.2 -&gt; 8.12.1 and fix gitGraph crash (<a href="https://github.com/laurent22/joplin/issues/5448">#5448</a>) (<a href="https://github.com/laurent22/joplin/issues/5295">#5295</a> by Helmut K. C. Tessarek)</li>
+<li>Fixed: Editor max width was not always applied in Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/5461">#5461</a>)</li>
+<li>Fixed: Misinterpreted search term after filter in quotation marks (<a href="https://github.com/laurent22/joplin/issues/5445">#5445</a>) (<a href="https://github.com/laurent22/joplin/issues/5444">#5444</a> by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>Fixed: Plugin onNoteSelectionChange() is triggered twice after a search (<a href="https://github.com/laurent22/joplin/issues/5449">#5449</a>) (<a href="https://github.com/laurent22/joplin/issues/5447">#5447</a> by Kenichi Kobayashi)</li>
+<li>Fixed: Underline was not applied when using Cmd+U in Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/5480">#5480</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.6">v2.4.6</a> (Pre-release) - 2021-09-09T18:57:17Z<a name="v2-4-6-https-github-com-laurent22-joplin-releases-tag-v2-4-6-pre-release-2021-09-09t18-57-17z" href="#v2-4-6-https-github-com-laurent22-joplin-releases-tag-v2-4-6-pre-release-2021-09-09t18-57-17z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Plugins: Add support for enabledConditions when creating menu item from command (9260b2a)</li>
+<li>Fixed: Fix handling of disabled master keys when enabling E2EE (267c321)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.5">v2.4.5</a> (Pre-release) - 2021-09-06T18:03:28Z<a name="v2-4-5-https-github-com-laurent22-joplin-releases-tag-v2-4-5-pre-release-2021-09-06t18-03-28z" href="#v2-4-5-https-github-com-laurent22-joplin-releases-tag-v2-4-5-pre-release-2021-09-06t18-03-28z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Linux: Add Centos 7 for no sandbox (<a href="https://github.com/laurent22/joplin/issues/5401">#5401</a> by <a href="https://github.com/geant44">@geant44</a>)</li>
+<li>Improved: Allow disabling any master key, including default or active one (9407efd)</li>
+<li>Improved: Api: Add support for &quot;events&quot; end point to retrieve info about latest note changes (<a href="https://github.com/laurent22/joplin/issues/5199">#5199</a>)</li>
+<li>Improved: Load themes as CSS variables for use in custom themes and internal components (478d4ac)</li>
+<li>Improved: Sort plugin results according to recommended property, and display Recommended tag (d97ba57)</li>
+<li>Fixed: Handle invalid search index in Goto Anything (<a href="https://github.com/laurent22/joplin/issues/5417">#5417</a>)</li>
+<li>Fixed: Plugins: Fixed import API (736bbbd)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.4">v2.4.4</a> (Pre-release) - 2021-08-30T16:02:51Z<a name="v2-4-4-https-github-com-laurent22-joplin-releases-tag-v2-4-4-pre-release-2021-08-30t16-02-51z" href="#v2-4-4-https-github-com-laurent22-joplin-releases-tag-v2-4-4-pre-release-2021-08-30t16-02-51z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for single master password, to simplify handling of multiple encryption keys (ce89ee5)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.3">v2.4.3</a> (Pre-release) - 2021-08-28T15:27:32Z<a name="v2-4-3-https-github-com-laurent22-joplin-releases-tag-v2-4-3-pre-release-2021-08-28t15-27-32z" href="#v2-4-3-https-github-com-laurent22-joplin-releases-tag-v2-4-3-pre-release-2021-08-28t15-27-32z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Display link to browse plugins when repository cannot be reached (<a href="https://github.com/laurent22/joplin/issues/5161">#5161</a>)</li>
+<li>Fixed: Fixed crash when a required master key does not exist (<a href="https://github.com/laurent22/joplin/issues/5391">#5391</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.2">v2.4.2</a> (Pre-release) - 2021-08-27T17:13:21Z<a name="v2-4-2-https-github-com-laurent22-joplin-releases-tag-v2-4-2-pre-release-2021-08-27t17-13-21z" href="#v2-4-2-https-github-com-laurent22-joplin-releases-tag-v2-4-2-pre-release-2021-08-27t17-13-21z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Allow specific deprecated plugins to still work (f19c4ab)</li>
+<li>Improved: Disable inline code background in vim mode (<a href="https://github.com/laurent22/joplin/issues/5370">#5370</a>) (<a href="https://github.com/laurent22/joplin/issues/5364">#5364</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Improved: Do not display master key upgrade warnings for new master keys (70efadd)</li>
+<li>Improved: Various improvements to Markdown import and export (<a href="https://github.com/laurent22/joplin/issues/5290">#5290</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Fixed: &quot;Move to notebook&quot; would break with empty input (<a href="https://github.com/laurent22/joplin/issues/5346">#5346</a>)</li>
+<li>Fixed: Prevent it from crashing with too long search queries (<a href="https://github.com/laurent22/joplin/issues/5380">#5380</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.4.1">v2.4.1</a> (Pre-release) - 2021-08-21T11:52:30Z<a name="v2-4-1-https-github-com-laurent22-joplin-releases-tag-v2-4-1-pre-release-2021-08-21t11-52-30z" href="#v2-4-1-https-github-com-laurent22-joplin-releases-tag-v2-4-1-pre-release-2021-08-21t11-52-30z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add Sync Wizard dialog (fe4900d)</li>
+<li>New: Add a way to disable a master key (7faa58e)</li>
+<li>New: Added &quot;None&quot; sync target to allow disabling synchronisation (f5f05e6)</li>
+<li>Improved: Improved sync locks so that they do not prevent upgrading a sync target (06ed58b)</li>
+<li>Improved: Place code-block background in the back in Markdown editor (<a href="https://github.com/laurent22/joplin/issues/5322">#5322</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Improved: Plugins: Improved support for fitToContent webview property (<a href="https://github.com/laurent22/joplin/issues/5298">#5298</a>) (<a href="https://github.com/laurent22/joplin/issues/5288">#5288</a> by <a href="https://github.com/Ahmad45123">@Ahmad45123</a>)</li>
+<li>Improved: Removes markdown inline code padding (<a href="https://github.com/laurent22/joplin/issues/5331">#5331</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Improved: Split code block class in two (<a href="https://github.com/laurent22/joplin/issues/5359">#5359</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Fixed: Add more specific classes for CodeMirror elements (<a href="https://github.com/laurent22/joplin/issues/5333">#5333</a>) (<a href="https://github.com/laurent22/joplin/issues/5327">#5327</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Fixed: Fixed file paths when exporting as HTML (<a href="https://github.com/laurent22/joplin/issues/5325">#5325</a>)</li>
+<li>Fixed: GotoAnything is not working on first try (<a href="https://github.com/laurent22/joplin/issues/5184">#5184</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.3.5">v2.3.5</a> - 2021-08-17T06:43:30Z<a name="v2-3-5-https-github-com-laurent22-joplin-releases-tag-v2-3-5-2021-08-17t06-43-30z" href="#v2-3-5-https-github-com-laurent22-joplin-releases-tag-v2-3-5-2021-08-17t06-43-30z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Allow setting a max width for the editor content (8063c94)</li>
+<li>Improved: Improved Markdown editor code styling, and add CSS classes for code (<a href="https://github.com/laurent22/joplin/issues/5314">#5314</a>) (<a href="https://github.com/laurent22/joplin/issues/5297">#5297</a> by <a href="https://github.com/CalebJohn">@CalebJohn</a>)</li>
+<li>Fixed: Bump hightlight.js to v11.2 (<a href="https://github.com/laurent22/joplin/issues/5278">#5278</a>) (<a href="https://github.com/laurent22/joplin/issues/5245">#5245</a> by Roman Musin)</li>
+<li>Fixed (Regression): Fixed file paths when exporting as HTML (<a href="https://github.com/laurent22/joplin/issues/5325">#5325</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.3.3">v2.3.3</a> - 2021-08-14T09:19:40Z<a name="v2-3-3-https-github-com-laurent22-joplin-releases-tag-v2-3-3-2021-08-14t09-19-40z" href="#v2-3-3-https-github-com-laurent22-joplin-releases-tag-v2-3-3-2021-08-14t09-19-40z" class="heading-anchor">🔗</a></h2>
+<p>CAUTION: This release will ask you to upgrade your sync target, whether it's Dropbox, OneDrive, Joplin Cloud, etc. Once it is done, only apps version 2.3+ will be able to sync with it, so make sure you are ready to upgrade all your apps before installing this version.</p>
+<ul>
+<li>Improved: Improved E2EE usability by making its state a property of the sync target (<a href="https://github.com/laurent22/joplin/issues/5276">#5276</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.2.7">v2.2.7</a> - 2021-08-11T11:03:26Z<a name="v2-2-7-https-github-com-laurent22-joplin-releases-tag-v2-2-7-2021-08-11t11-03-26z" href="#v2-2-7-https-github-com-laurent22-joplin-releases-tag-v2-2-7-2021-08-11t11-03-26z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Revert &quot;Plugins: Add ability to make dialogs fit the application window (<a href="https://github.com/laurent22/joplin/issues/5219">#5219</a>)&quot; as it breaks several plugin webviews.</li>
+<li>Revert &quot;Resolves <a href="https://github.com/laurent22/joplin/issues/4810">#4810</a>, Resolves <a href="https://github.com/laurent22/joplin/issues/4610">#4610</a>: Fix AWS S3 sync error and upgrade framework to v3 (<a href="https://github.com/laurent22/joplin/issues/5212">#5212</a>)&quot; due to incompatibility with some AWS providers.</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.2.6">v2.2.6</a> (Pre-release) - 2021-08-09T19:29:20Z<a name="v2-2-6-https-github-com-laurent22-joplin-releases-tag-v2-2-6-pre-release-2021-08-09t19-29-20z" href="#v2-2-6-https-github-com-laurent22-joplin-releases-tag-v2-2-6-pre-release-2021-08-09t19-29-20z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Fix AWS S3 sync error and upgrade framework to v3 (<a href="https://github.com/laurent22/joplin/issues/5212">#5212</a>) (<a href="https://github.com/laurent22/joplin/issues/4810">#4810</a> by Lee Matos)</li>
+<li>Improved: Handles OneDrive throttling responses and sets User-Agent based on Microsoft best practices (<a href="https://github.com/laurent22/joplin/issues/5246">#5246</a>) (<a href="https://github.com/laurent22/joplin/issues/5244">#5244</a> by <a href="https://github.com/alec">@alec</a>)</li>
+<li>Improved: Plugins: Hide note list menu items for commands that are disabled (<a href="https://github.com/laurent22/joplin/issues/5270">#5270</a> by <a href="https://github.com/Ahmad45123">@Ahmad45123</a>)</li>
+<li>Improved: Prevent plugins from crashing the application (<a href="https://github.com/laurent22/joplin/issues/5273">#5273</a>)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.2.5">v2.2.5</a> (Pre-release) - 2021-08-07T10:35:24Z<a name="v2-2-5-https-github-com-laurent22-joplin-releases-tag-v2-2-5-pre-release-2021-08-07t10-35-24z" href="#v2-2-5-https-github-com-laurent22-joplin-releases-tag-v2-2-5-pre-release-2021-08-07t10-35-24z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Improved: Remove template feature (replaced by template plugin) (e9d5901)</li>
@@ -3474,41 +3601,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/changelog_android/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/changelog_android.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin Android app changelog | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -286,6 +291,48 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin Android app changelog<a name="joplin-android-app-changelog" href="#joplin-android-app-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.4.3">android-v2.4.3</a> - 2021-09-29T18:47:24Z<a name="android-v2-4-3-https-github-com-laurent22-joplin-releases-tag-android-v2-4-3-2021-09-29t18-47-24z" href="#android-v2-4-3-https-github-com-laurent22-joplin-releases-tag-android-v2-4-3-2021-09-29t18-47-24z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fix default sync target (4b39d30)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.4.2">android-v2.4.2</a> (Pre-release) - 2021-09-22T17:02:37Z<a name="android-v2-4-2-https-github-com-laurent22-joplin-releases-tag-android-v2-4-2-pre-release-2021-09-22t17-02-37z" href="#android-v2-4-2-https-github-com-laurent22-joplin-releases-tag-android-v2-4-2-pre-release-2021-09-22t17-02-37z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Allow disabling any master key, including default or active one (9407efd)</li>
+<li>Improved: Update Mermaid 8.10.2 -&gt; 8.12.1 and fix gitGraph crash (#5448) (#5295 by Helmut K. C. Tessarek)</li>
+<li>Fixed: Misinterpreted search term after filter in quotation marks (#5445) (#5444 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.4.1">android-v2.4.1</a> (Pre-release) - 2021-08-30T13:37:34Z<a name="android-v2-4-1-https-github-com-laurent22-joplin-releases-tag-android-v2-4-1-pre-release-2021-08-30t13-37-34z" href="#android-v2-4-1-https-github-com-laurent22-joplin-releases-tag-android-v2-4-1-pre-release-2021-08-30t13-37-34z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add a way to disable a master key (7faa58e)</li>
+<li>New: Add support for single master password, to simplify handling of multiple encryption keys (ce89ee5)</li>
+<li>New: Added &quot;None&quot; sync target to allow disabling synchronisation (f5f05e6)</li>
+<li>Improved: Do not display master key upgrade warnings for new master keys (70efadd)</li>
+<li>Improved: Improved sync locks so that they do not prevent upgrading a sync target (06ed58b)</li>
+<li>Improved: Show the used tags first in the tagging dialog (#5315 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>Fixed: Fixed crash when a required master key does not exist (#5391)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.3.4">android-v2.3.4</a> (Pre-release) - 2021-08-15T13:27:57Z<a name="android-v2-3-4-https-github-com-laurent22-joplin-releases-tag-android-v2-3-4-pre-release-2021-08-15t13-27-57z" href="#android-v2-3-4-https-github-com-laurent22-joplin-releases-tag-android-v2-3-4-pre-release-2021-08-15t13-27-57z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Bump hightlight.js to v11.2 (#5278) (#5245 by Roman Musin)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.3.3">android-v2.3.3</a> (Pre-release) - 2021-08-12T20:46:15Z<a name="android-v2-3-3-https-github-com-laurent22-joplin-releases-tag-android-v2-3-3-pre-release-2021-08-12t20-46-15z" href="#android-v2-3-3-https-github-com-laurent22-joplin-releases-tag-android-v2-3-3-pre-release-2021-08-12t20-46-15z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Improved E2EE usability by making its state a property of the sync target (#5276)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.2.5">android-v2.2.5</a> (Pre-release) - 2021-08-11T10:54:38Z<a name="android-v2-2-5-https-github-com-laurent22-joplin-releases-tag-android-v2-2-5-pre-release-2021-08-11t10-54-38z" href="#android-v2-2-5-https-github-com-laurent22-joplin-releases-tag-android-v2-2-5-pre-release-2021-08-11t10-54-38z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Revert &quot;Plugins: Add ability to make dialogs fit the application window (#5219)&quot; as it breaks several plugin webviews.</li>
+<li>Revert &quot;Resolves #4810, Resolves #4610: Fix AWS S3 sync error and upgrade framework to v3 (#5212)&quot; due to incompatibility with some AWS providers.</li>
+<li>Improved: Upgraded React Native to v0.64 (afb7e1a)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.2.3">android-v2.2.3</a> (Pre-release) - 2021-08-09T18:48:29Z<a name="android-v2-2-3-https-github-com-laurent22-joplin-releases-tag-android-v2-2-3-pre-release-2021-08-09t18-48-29z" href="#android-v2-2-3-https-github-com-laurent22-joplin-releases-tag-android-v2-2-3-pre-release-2021-08-09t18-48-29z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Ensure that timestamps are not changed when sharing or unsharing a note (cafaa9c)</li>
+<li>Improved: Fix AWS S3 sync error and upgrade framework to v3 (#5212) (#4810 by Lee Matos)</li>
+<li>Improved: Handles OneDrive throttling responses and sets User-Agent based on Microsoft best practices (#5246) (#5244 by <a href="https://github.com/alec">@alec</a>)</li>
+<li>Improved: Make sync icon spin in the right direction (#5275) (#4588 by Lee Matos)</li>
+<li>Fixed: Fixed issue with orphaned resource being created in case of a resource conflict (#5223)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.2.1">android-v2.2.1</a> (Pre-release) - 2021-07-13T17:37:38Z<a name="android-v2-2-1-https-github-com-laurent22-joplin-releases-tag-android-v2-2-1-pre-release-2021-07-13t17-37-38z" href="#android-v2-2-1-https-github-com-laurent22-joplin-releases-tag-android-v2-2-1-pre-release-2021-07-13t17-37-38z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Added improved editor (beta)</li>
@@ -354,41 +401,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/changelog_cli/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/changelog_cli.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin terminal app changelog | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -286,6 +291,37 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin terminal app changelog<a name="joplin-terminal-app-changelog" href="#joplin-terminal-app-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v2.4.1">cli-v2.4.1</a> - 2021-09-29T15:28:01Z<a name="cli-v2-4-1-https-github-com-laurent22-joplin-releases-tag-cli-v2-4-1-2021-09-29t15-28-01z" href="#cli-v2-4-1-https-github-com-laurent22-joplin-releases-tag-cli-v2-4-1-2021-09-29t15-28-01z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add a way to disable a master key (7faa58e)</li>
+<li>New: Add support for single master password, to simplify handling of multiple encryption keys (ce89ee5)</li>
+<li>New: Added &quot;None&quot; sync target to allow disabling synchronisation (f5f05e6)</li>
+<li>Improved: Allow importing certain corrupted ENEX files (f144dae)</li>
+<li>Improved: Improved sync locks so that they do not prevent upgrading a sync target (06ed58b)</li>
+<li>Fixed: Fixed file paths when exporting as HTML (#5325)</li>
+<li>Fixed: Misinterpreted search term after filter in quotation marks (#5445) (#5444 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>Fixed: Setting note contents using &quot;set&quot; command does not update note timestamp (#5435)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v2.3.2">cli-v2.3.2</a> - 2021-08-16T09:38:40Z<a name="cli-v2-3-2-https-github-com-laurent22-joplin-releases-tag-cli-v2-3-2-2021-08-16t09-38-40z" href="#cli-v2-3-2-https-github-com-laurent22-joplin-releases-tag-cli-v2-3-2-2021-08-16t09-38-40z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Improved E2EE usability by making its state a property of the sync target (#5276)</li>
+<li>Fixed: Bump hightlight.js to v11.2 (#5278) (#5245 by Roman Musin)</li>
+<li>Fixed: Fixed version command so that it does not require the keychain (ca6d8ec)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v2.2.2">cli-v2.2.2</a> - 2021-08-11T15:34:56Z<a name="cli-v2-2-2-https-github-com-laurent22-joplin-releases-tag-cli-v2-2-2-2021-08-11t15-34-56z" href="#cli-v2-2-2-https-github-com-laurent22-joplin-releases-tag-cli-v2-2-2-2021-08-11t15-34-56z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fixed version command so that it does not require the keychain (15766d1)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v2.2.1">cli-v2.2.1</a> - 2021-08-10T10:21:09Z<a name="cli-v2-2-1-https-github-com-laurent22-joplin-releases-tag-cli-v2-2-1-2021-08-10t10-21-09z" href="#cli-v2-2-1-https-github-com-laurent22-joplin-releases-tag-cli-v2-2-1-2021-08-10t10-21-09z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Ensure that timestamps are not changed when sharing or unsharing a note (cafaa9c)</li>
+<li>Improved: Fix AWS S3 sync error and upgrade framework to v3 (#5212) (#4810 by Lee Matos)</li>
+<li>Improved: Handles OneDrive throttling responses and sets User-Agent based on Microsoft best practices (#5246) (#5244 by <a href="https://github.com/alec">@alec</a>)</li>
+<li>Improved: Interpret only valid search filters (#5103) (#3871 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>Fixed: Do not export share properties (#5232)</li>
+<li>Fixed: Fixed issue with orphaned resource being created in case of a resource conflict (#5223)</li>
+<li>Fixed: Import highlighted text from ENEX files (#5213)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v2.1.2">cli-v2.1.2</a> - 2021-06-27T15:51:36Z<a name="cli-v2-1-2-https-github-com-laurent22-joplin-releases-tag-cli-v2-1-2-2021-06-27t15-51-36z" href="#cli-v2-1-2-https-github-com-laurent22-joplin-releases-tag-cli-v2-1-2-2021-06-27t15-51-36z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add support for X-API-MIN-VERSION header (51f3c00)</li>
@@ -616,41 +652,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/changelog_server/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/changelog_server.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin Server Changelog | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -286,7 +291,116 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin Server Changelog<a name="joplin-server-changelog" href="#joplin-server-changelog" class="heading-anchor">🔗</a></h1>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.11-beta">server-v2.2.11-beta</a> (Pre-release) - 2021-08-03T18:48:00Z<a name="server-v2-2-11-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-11-beta-pre-release-2021-08-03t18-48-00z" href="#server-v2-2-11-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-11-beta-pre-release-2021-08-03t18-48-00z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.5.5">server-v2.5.5</a> - 2021-10-23T20:58:37Z<a name="server-v2-5-5-https-github-com-laurent22-joplin-releases-tag-server-v2-5-5-2021-10-23t20-58-37z" href="#server-v2-5-5-https-github-com-laurent22-joplin-releases-tag-server-v2-5-5-2021-10-23t20-58-37z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added tool to delete old changes (169b585)</li>
+<li>Fixed: Fixed issue when a notebook is shared, then unshared, then shared again (47fc51e)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.5.2">server-v2.5.2</a> - 2021-10-07T13:36:27Z<a name="server-v2-5-2-https-github-com-laurent22-joplin-releases-tag-server-v2-5-2-2021-10-07t13-36-27z" href="#server-v2-5-2-https-github-com-laurent22-joplin-releases-tag-server-v2-5-2-2021-10-07t13-36-27z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for promotion codes (5b58811)</li>
+<li>Improved: Sort flags by date (31efc9b)</li>
+<li>Fixed: Fixed links in published notes (#5507)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.5.1">server-v2.5.1</a> - 2021-09-29T15:52:34Z<a name="server-v2-5-1-https-github-com-laurent22-joplin-releases-tag-server-v2-5-1-2021-09-29t15-52-34z" href="#server-v2-5-1-https-github-com-laurent22-joplin-releases-tag-server-v2-5-1-2021-09-29t15-52-34z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for events and use them to track background tasks (79d1ad7)</li>
+<li>Improved: Allow manually deleting a user flag (3a11885)</li>
+<li>Improved: Also clear admin session ID on logout after impersonating a user (24945a0)</li>
+<li>Improved: Correctly attach Stripe sub to Joplin Server sub when it is recreated from Stripe (5da820a)</li>
+<li>Improved: Display banner when an account is disabled and provide reason (8c9331c)</li>
+<li>Improved: Only disable API access when an account is disabled (6fec2a9)</li>
+<li>Improved: Remove AccountOverLimit flag from accounts that are now below the limit (5de5370)</li>
+<li>Improved: Send reminder email every time a payment fails (2dd8045)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.4.11-beta">server-v2.4.11-beta</a> - 2021-09-26T17:10:57Z<a name="server-v2-4-11-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-4-11-beta-2021-09-26t17-10-57z" href="#server-v2-4-11-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-4-11-beta-2021-09-26t17-10-57z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Do not allow accepting share more than once (57a1d03)</li>
+<li>Fixed: Fixed Stripe checkout when a coupon is used (c45f961)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.4.10-beta">server-v2.4.10-beta</a> (Pre-release) - 2021-09-25T19:07:05Z<a name="server-v2-4-10-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-4-10-beta-pre-release-2021-09-25t19-07-05z" href="#server-v2-4-10-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-4-10-beta-pre-release-2021-09-25t19-07-05z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Improved share service reliability and optimised performance (0175348)</li>
+<li>Security: Implement clickjacking defense (e3fd34e)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.4.9-beta">server-v2.4.9</a> - 2021-09-22T16:31:23Z<a name="server-v2-4-9-https-github-com-laurent22-joplin-releases-tag-server-v2-4-9-beta-2021-09-22t16-31-23z" href="#server-v2-4-9-https-github-com-laurent22-joplin-releases-tag-server-v2-4-9-beta-2021-09-22t16-31-23z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add support for changing user own email (63e88c0)</li>
+<li>Improved: Allow an admin to impersonate a user (03b4b6e)</li>
+<li>Improved: Allow entering coupon code on Stripe checkout page (4577c9c)</li>
+<li>Improved: Clear cookie when account has been deleted to allow viewing login page again (061761f)</li>
+<li>Improved: Exclude certain queries from slow log (4e70ca6)</li>
+<li>Improved: Handle Joplin Cloud failed subscription payments (a6b1cff)</li>
+<li>Improved: Improved support for background tasks and added admin UI to view them (cd877f6)</li>
+<li>Improved: Improved user list page (4d38397)</li>
+<li>Improved: Link to Joplin Cloud signup page on login page (d850eed)</li>
+<li>Improved: Manage subscription entirely from Stripe (7fac194)</li>
+<li>Improved: Redirect to user page after changing a user (c91d4bd)</li>
+<li>Improved: Rename admin button &quot;Send reset password email&quot; to more correct &quot;Send account information email&quot; (37d446b)</li>
+<li>Improved: Sync deleted items first to allow fixing oversized accounts (43c594b)</li>
+<li>Fixed: Fixed calculating total item size after an item has been deleted (024967c)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.4.8-beta">server-v2.4.8</a> - 2021-09-15T22:16:59Z<a name="server-v2-4-8-https-github-com-laurent22-joplin-releases-tag-server-v2-4-8-beta-2021-09-15t22-16-59z" href="#server-v2-4-8-https-github-com-laurent22-joplin-releases-tag-server-v2-4-8-beta-2021-09-15t22-16-59z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added support for app level slow SQL query log (5e8b742)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.4.7-beta">server-v2.4.7</a> - 2021-09-15T15:58:46Z<a name="server-v2-4-7-https-github-com-laurent22-joplin-releases-tag-server-v2-4-7-beta-2021-09-15t15-58-46z" href="#server-v2-4-7-https-github-com-laurent22-joplin-releases-tag-server-v2-4-7-beta-2021-09-15t15-58-46z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Improve flag logic (c229821)</li>
+<li>Fixed: Fixed handling of brute force limiter by getting correct user IP (3ce947e)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.4.6-beta">server-v2.4.6</a> - 2021-09-14T15:02:21Z<a name="server-v2-4-6-https-github-com-laurent22-joplin-releases-tag-server-v2-4-6-beta-2021-09-14t15-02-21z" href="#server-v2-4-6-https-github-com-laurent22-joplin-releases-tag-server-v2-4-6-beta-2021-09-14t15-02-21z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add link to Stripe subscription page to manage payment details (4e7fe66)</li>
+<li>New: Add transaction info to debug deadlock issues (01b653f)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.4.3-beta">server-v2.4.3</a> - 2021-09-02T17:49:11Z<a name="server-v2-4-3-https-github-com-laurent22-joplin-releases-tag-server-v2-4-3-beta-2021-09-02t17-49-11z" href="#server-v2-4-3-https-github-com-laurent22-joplin-releases-tag-server-v2-4-3-beta-2021-09-02t17-49-11z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added Help page for Joplin Cloud (6520a48)</li>
+<li>New: Added icon next to profile button (5805a41)</li>
+<li>Improved: Display note title as page title when sharing note (82331c9)</li>
+<li>Fixed: Fixed calculation of max sizes for Postgres (93a4ad0)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.4.2">server-v2.4.2</a> - 2021-08-28T17:45:41Z<a name="server-v2-4-2-https-github-com-laurent22-joplin-releases-tag-server-v2-4-2-2021-08-28t17-45-41z" href="#server-v2-4-2-https-github-com-laurent22-joplin-releases-tag-server-v2-4-2-2021-08-28t17-45-41z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add request rate limter on session and login end points (543413d)</li>
+<li>New: Add support for user flags (82b157b)</li>
+<li>New: Added commands to control db migrations - list, down, up (2c79ce2)</li>
+<li>Improved: Display user flags in profile when logged in as admin (4394329)</li>
+<li>Improved: Handle flags for accounts over limit (6e087bc)</li>
+<li>Improved: Increase cookies security - set HttpOnly, Secure and SameSite flags (bcadb36)</li>
+<li>Improved: No longer install vim into the image (#5337 by <a href="https://github.com/piotrb">@piotrb</a>)</li>
+<li>Improved: Re-enable account when new subscription is associated with it (ac82e4b)</li>
+<li>Improved: Switch to node:16-bullseye base image (#5202 by <a href="https://github.com/piotrb">@piotrb</a>)</li>
+<li>Fixed: Prevent crash when returning too many rows using SQLite (1efe3d3)</li>
+<li>Fixed: Filenames with non-ascii characters could not be downloaded from published note (#5328)</li>
+<li>Fixed: Fix missing CSS file error (#5309 by <a href="https://github.com/whalehub">@whalehub</a>)</li>
+<li>Fixed: Fixed second duration (c7421df)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.3.7-beta">server-v2.3.7</a> - 2021-08-13T21:20:17Z<a name="server-v2-3-7-https-github-com-laurent22-joplin-releases-tag-server-v2-3-7-beta-2021-08-13t21-20-17z" href="#server-v2-3-7-https-github-com-laurent22-joplin-releases-tag-server-v2-3-7-beta-2021-08-13t21-20-17z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fix migrations (a9961ae)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.3.6-beta">server-v2.3.6</a> - 2021-08-13T20:59:41Z<a name="server-v2-3-6-https-github-com-laurent22-joplin-releases-tag-server-v2-3-6-beta-2021-08-13t20-59-41z" href="#server-v2-3-6-https-github-com-laurent22-joplin-releases-tag-server-v2-3-6-beta-2021-08-13t20-59-41z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fix migrations (f518549)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.3.5-beta">server-v2.3.5</a> - 2021-08-13T18:01:20Z<a name="server-v2-3-5-https-github-com-laurent22-joplin-releases-tag-server-v2-3-5-beta-2021-08-13t18-01-20z" href="#server-v2-3-5-https-github-com-laurent22-joplin-releases-tag-server-v2-3-5-beta-2021-08-13t18-01-20z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Fixed: Fixed pagination link styling (d42d181)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.3.4-beta">server-v2.3.4</a> - 2021-08-13T16:56:17Z<a name="server-v2-3-4-https-github-com-laurent22-joplin-releases-tag-server-v2-3-4-beta-2021-08-13t16-56-17z" href="#server-v2-3-4-https-github-com-laurent22-joplin-releases-tag-server-v2-3-4-beta-2021-08-13t16-56-17z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Allow setting email key to prevent the same email to be sent multiple times (391204c)</li>
+<li>Improved: Clarify beta transition message (c4fcfec)</li>
+<li>Improved: Disable upload for accounts with subscription failed payments (f14c74d)</li>
+<li>Improved: Re-enable account when subscription is paid (4b5318c)</li>
+<li>Improved: Set better filename and mime type for files downloaded via published notes (#5286)</li>
+<li>Fixed: Fixed publishing of notes with HTML markup type (97726b0)</li>
+<li>Fixed: Fix regression (6359c9c)</li>
+<li>Fixed: Fixed layout of notes on mobile devices (#5269)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.11-beta">server-v2.2.11</a> - 2021-08-03T18:48:00Z<a name="server-v2-2-11-https-github-com-laurent22-joplin-releases-tag-server-v2-2-11-beta-2021-08-03t18-48-00z" href="#server-v2-2-11-https-github-com-laurent22-joplin-releases-tag-server-v2-2-11-beta-2021-08-03t18-48-00z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Improved: Disable beta account once expired (785248b)</li>
 <li>Improved: Handle beta user upgrade (8910c87)</li>
@@ -297,7 +411,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <ul>
 <li>Improved: Allows providing a coupon when creating the Stripe checkout session (b5b6111)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.9-beta">server-v2.2.9-beta</a> (Pre-release) - 2021-07-31T13:52:53Z<a name="server-v2-2-9-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-9-beta-pre-release-2021-07-31t13-52-53z" href="#server-v2-2-9-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-9-beta-pre-release-2021-07-31t13-52-53z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.9-beta">server-v2.2.9</a> - 2021-07-31T13:52:53Z<a name="server-v2-2-9-https-github-com-laurent22-joplin-releases-tag-server-v2-2-9-beta-2021-07-31t13-52-53z" href="#server-v2-2-9-https-github-com-laurent22-joplin-releases-tag-server-v2-2-9-beta-2021-07-31t13-52-53z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add Docker major, minor and beta version tags (#5237 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
 <li>New: Add support for Stripe yearly subscriptions (f2547fe)</li>
@@ -305,9 +419,9 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <li>Fixed: Fixed certain URLs (282f782)</li>
 <li>Fixed: Published notes that contain non-alphabetical characters could end up being truncated (#5229)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.8-beta">server-v2.2.8-beta</a> (Pre-release) - 2021-07-24T16:55:58Z<a name="server-v2-2-8-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-8-beta-pre-release-2021-07-24t16-55-58z" href="#server-v2-2-8-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-8-beta-pre-release-2021-07-24t16-55-58z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.8-beta">server-v2.2.8</a> - 2021-07-24T16:55:58Z<a name="server-v2-2-8-https-github-com-laurent22-joplin-releases-tag-server-v2-2-8-beta-2021-07-24t16-55-58z" href="#server-v2-2-8-https-github-com-laurent22-joplin-releases-tag-server-v2-2-8-beta-2021-07-24t16-55-58z" class="heading-anchor">🔗</a></h2>
 <ul>
-<li>New: Added form tokens to prevent CSRF attacks (19b45de)</li>
+<li>New: Added form tokens to prevent CSRF attacks (CVE-2021-23431) (19b45de)</li>
 <li>Improved: Allow admin to change Stripe subscription (75a421e)</li>
 <li>Improved: Allow enabling or disabling a user. Handle cancelling subscription. (27c3cbd)</li>
 <li>Improved: Allow user to upgrade account (e83ab93)</li>
@@ -319,37 +433,37 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <li>Improved: Moved email templates to separate files (6a93cb2)</li>
 <li>Improved: Set default of env SUPPORT_EMAIL to &quot;SUPPORT_EMAIL&quot; to make it clear it needs to be set (92520e5)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.7-beta">server-v2.2.7-beta</a> (Pre-release) - 2021-07-11T17:31:42Z<a name="server-v2-2-7-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-7-beta-pre-release-2021-07-11t17-31-42z" href="#server-v2-2-7-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-7-beta-pre-release-2021-07-11t17-31-42z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.7-beta">server-v2.2.7</a> - 2021-07-11T17:31:42Z<a name="server-v2-2-7-https-github-com-laurent22-joplin-releases-tag-server-v2-2-7-beta-2021-07-11t17-31-42z" href="#server-v2-2-7-https-github-com-laurent22-joplin-releases-tag-server-v2-2-7-beta-2021-07-11t17-31-42z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Added support for resetting user password (62b6198)</li>
 <li>Improved: Check password complexity (240cb35)</li>
 <li>Improved: Disallow changing email address until a secure solution to change it is implemented (f8d2c26)</li>
 <li>Fixed: Fixed mail queue as some emails were not being processed (89f4ca1)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.6-beta">server-v2.2.6-beta</a> (Pre-release) - 2021-07-09T15:57:47Z<a name="server-v2-2-6-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-6-beta-pre-release-2021-07-09t15-57-47z" href="#server-v2-2-6-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-6-beta-pre-release-2021-07-09t15-57-47z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.6-beta">server-v2.2.6</a> - 2021-07-09T15:57:47Z<a name="server-v2-2-6-https-github-com-laurent22-joplin-releases-tag-server-v2-2-6-beta-2021-07-09t15-57-47z" href="#server-v2-2-6-https-github-com-laurent22-joplin-releases-tag-server-v2-2-6-beta-2021-07-09t15-57-47z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add Docker image labels (#5158 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
 <li>Fixed: Fixed change processing logic (5a27d4d)</li>
 <li>Fixed: Fixed styling of shared note (6c1a6b0)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.5-beta">server-v2.2.5-beta</a> (Pre-release) - 2021-07-03T21:40:37Z<a name="server-v2-2-5-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-5-beta-pre-release-2021-07-03t21-40-37z" href="#server-v2-2-5-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-5-beta-pre-release-2021-07-03t21-40-37z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.5-beta">server-v2.2.5</a> - 2021-07-03T21:40:37Z<a name="server-v2-2-5-https-github-com-laurent22-joplin-releases-tag-server-v2-2-5-beta-2021-07-03t21-40-37z" href="#server-v2-2-5-https-github-com-laurent22-joplin-releases-tag-server-v2-2-5-beta-2021-07-03t21-40-37z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Improved: Make app context immutable and derive the per-request context properties from it (e210926)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.4-beta">server-v2.2.4-beta</a> (Pre-release) - 2021-07-03T21:10:29Z<a name="server-v2-2-4-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-4-beta-pre-release-2021-07-03t21-10-29z" href="#server-v2-2-4-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-4-beta-pre-release-2021-07-03t21-10-29z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.4-beta">server-v2.2.4</a> - 2021-07-03T21:10:29Z<a name="server-v2-2-4-https-github-com-laurent22-joplin-releases-tag-server-v2-2-4-beta-2021-07-03t21-10-29z" href="#server-v2-2-4-https-github-com-laurent22-joplin-releases-tag-server-v2-2-4-beta-2021-07-03t21-10-29z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fixed issue with user sessions being mixed up (238cc86)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.3-beta">server-v2.2.3-beta</a> (Pre-release) - 2021-07-03T19:38:36Z<a name="server-v2-2-3-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-3-beta-pre-release-2021-07-03t19-38-36z" href="#server-v2-2-3-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-3-beta-pre-release-2021-07-03t19-38-36z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.3-beta">server-v2.2.3</a> - 2021-07-03T19:38:36Z<a name="server-v2-2-3-https-github-com-laurent22-joplin-releases-tag-server-v2-2-3-beta-2021-07-03t19-38-36z" href="#server-v2-2-3-https-github-com-laurent22-joplin-releases-tag-server-v2-2-3-beta-2021-07-03t19-38-36z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fixed size of a database field (264f36f)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.2-beta">server-v2.2.2-beta</a> (Pre-release) - 2021-07-03T18:28:35Z<a name="server-v2-2-2-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-2-beta-pre-release-2021-07-03t18-28-35z" href="#server-v2-2-2-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-2-beta-pre-release-2021-07-03t18-28-35z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.2-beta">server-v2.2.2</a> - 2021-07-03T18:28:35Z<a name="server-v2-2-2-https-github-com-laurent22-joplin-releases-tag-server-v2-2-2-beta-2021-07-03t18-28-35z" href="#server-v2-2-2-https-github-com-laurent22-joplin-releases-tag-server-v2-2-2-beta-2021-07-03t18-28-35z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Improved: Improved logging and reliability of cron tasks (d99c34f)</li>
 <li>Improved: Only emit &quot;created&quot; event when new user is saved (8883df2)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.1-beta">server-v2.2.1-beta</a> (Pre-release) - 2021-07-03T15:41:32Z<a name="server-v2-2-1-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-1-beta-pre-release-2021-07-03t15-41-32z" href="#server-v2-2-1-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-1-beta-pre-release-2021-07-03t15-41-32z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.1-beta">server-v2.2.1</a> - 2021-07-03T15:41:32Z<a name="server-v2-2-1-https-github-com-laurent22-joplin-releases-tag-server-v2-2-1-beta-2021-07-03t15-41-32z" href="#server-v2-2-1-https-github-com-laurent22-joplin-releases-tag-server-v2-2-1-beta-2021-07-03t15-41-32z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add support for account max total size (b507fbf)</li>
 <li>Improved: Display max size info in dashboard (3d18514)</li>
@@ -358,21 +472,21 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <li>Improved: Normalize email addresses before saving them (427218b)</li>
 <li>Improved: Remove dangerous &quot;Delete all&quot; button for now (125af75)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.1.6-beta">server-v2.1.6-beta</a> (Pre-release) - 2021-06-24T10:01:46Z<a name="server-v2-1-6-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-1-6-beta-pre-release-2021-06-24t10-01-46z" href="#server-v2-1-6-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-1-6-beta-pre-release-2021-06-24t10-01-46z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.1.6-beta">server-v2.1.6</a> - 2021-06-24T10:01:46Z<a name="server-v2-1-6-https-github-com-laurent22-joplin-releases-tag-server-v2-1-6-beta-2021-06-24t10-01-46z" href="#server-v2-1-6-https-github-com-laurent22-joplin-releases-tag-server-v2-1-6-beta-2021-06-24t10-01-46z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fixed accessing main website (Regression) (f868797)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.1.5-beta">server-v2.1.5-beta</a> (Pre-release) - 2021-06-24T08:26:38Z<a name="server-v2-1-5-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-1-5-beta-pre-release-2021-06-24t08-26-38z" href="#server-v2-1-5-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-1-5-beta-pre-release-2021-06-24t08-26-38z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.1.5-beta">server-v2.1.5</a> - 2021-06-24T08:26:38Z<a name="server-v2-1-5-https-github-com-laurent22-joplin-releases-tag-server-v2-1-5-beta-2021-06-24t08-26-38z" href="#server-v2-1-5-https-github-com-laurent22-joplin-releases-tag-server-v2-1-5-beta-2021-06-24t08-26-38z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add support for X-API-MIN-VERSION header (51f3c00)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.1.4-beta">server-v2.1.4-beta</a> (Pre-release) - 2021-06-24T07:26:03Z<a name="server-v2-1-4-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-1-4-beta-pre-release-2021-06-24t07-26-03z" href="#server-v2-1-4-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-1-4-beta-pre-release-2021-06-24t07-26-03z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.1.4-beta">server-v2.1.4</a> - 2021-06-24T07:26:03Z<a name="server-v2-1-4-https-github-com-laurent22-joplin-releases-tag-server-v2-1-4-beta-2021-06-24t07-26-03z" href="#server-v2-1-4-https-github-com-laurent22-joplin-releases-tag-server-v2-1-4-beta-2021-06-24t07-26-03z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Improved: Split permission to share note or folder (0c12c7f)</li>
 <li>Fixed: Fixed handling of max item size for encrypted items (112157e)</li>
 <li>Fixed: Fixed transaction locking issue when a sub-transaction fails (12aae48)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.1.3-beta">server-v2.1.3-beta</a> (Pre-release) - 2021-06-19T14:15:06Z<a name="server-v2-1-3-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-1-3-beta-pre-release-2021-06-19t14-15-06z" href="#server-v2-1-3-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-1-3-beta-pre-release-2021-06-19t14-15-06z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.1.3-beta">server-v2.1.3</a> - 2021-06-19T14:15:06Z<a name="server-v2-1-3-https-github-com-laurent22-joplin-releases-tag-server-v2-1-3-beta-2021-06-19t14-15-06z" href="#server-v2-1-3-https-github-com-laurent22-joplin-releases-tag-server-v2-1-3-beta-2021-06-19t14-15-06z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add support for uploading multiple items in one request (3b9c02e)</li>
 </ul>
@@ -407,14 +521,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <li>Improved: Handle custom user content URLs (a36b13d)</li>
 <li>Fixed: Fixed error when creating user (594084e)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.9-beta">server-v2.0.9-beta</a> (Pre-release) - 2021-06-11T16:49:05Z<a name="server-v2-0-9-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-0-9-beta-pre-release-2021-06-11t16-49-05z" href="#server-v2-0-9-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-0-9-beta-pre-release-2021-06-11t16-49-05z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.9-beta">server-v2.0.9</a> - 2021-06-11T16:49:05Z<a name="server-v2-0-9-https-github-com-laurent22-joplin-releases-tag-server-v2-0-9-beta-2021-06-11t16-49-05z" href="#server-v2-0-9-https-github-com-laurent22-joplin-releases-tag-server-v2-0-9-beta-2021-06-11t16-49-05z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add navbar on login and sign up page (7a3a208)</li>
 <li>New: Added option to enable or disable stack traces (5614eb9)</li>
 <li>Improved: Handle custom user content URLs (a36b13d)</li>
 <li>Fixed: Fixed error when creating user (594084e)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.6">server-v2.0.6</a> (Pre-release) - 2021-06-07T17:27:27Z<a name="server-v2-0-6-https-github-com-laurent22-joplin-releases-tag-server-v2-0-6-pre-release-2021-06-07t17-27-27z" href="#server-v2-0-6-https-github-com-laurent22-joplin-releases-tag-server-v2-0-6-pre-release-2021-06-07t17-27-27z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.6">server-v2.0.6</a> - 2021-06-07T17:27:27Z<a name="server-v2-0-6-https-github-com-laurent22-joplin-releases-tag-server-v2-0-6-2021-06-07t17-27-27z" href="#server-v2-0-6-https-github-com-laurent22-joplin-releases-tag-server-v2-0-6-2021-06-07t17-27-27z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add Stripe integration (770af6a)</li>
 <li>New: Add request duration to log (c8d7ecb)</li>
@@ -423,21 +537,21 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <li>Improved: Check share ID when uploading a note (3c41b45)</li>
 <li>Improved: Load shared user content from correct domain (de45740)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.5">server-v2.0.5</a> (Pre-release) - 2021-06-02T08:14:47Z<a name="server-v2-0-5-https-github-com-laurent22-joplin-releases-tag-server-v2-0-5-pre-release-2021-06-02t08-14-47z" href="#server-v2-0-5-https-github-com-laurent22-joplin-releases-tag-server-v2-0-5-pre-release-2021-06-02t08-14-47z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.5">server-v2.0.5</a> - 2021-06-02T08:14:47Z<a name="server-v2-0-5-https-github-com-laurent22-joplin-releases-tag-server-v2-0-5-2021-06-02t08-14-47z" href="#server-v2-0-5-https-github-com-laurent22-joplin-releases-tag-server-v2-0-5-2021-06-02t08-14-47z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add version number on website (0ef7e98)</li>
 <li>New: Added signup pages (41ed66d)</li>
 <li>Improved: Allow disabling item upload for a user (f8a26cf)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.4">server-v2.0.4</a> (Pre-release) - 2021-05-25T18:33:11Z<a name="server-v2-0-4-https-github-com-laurent22-joplin-releases-tag-server-v2-0-4-pre-release-2021-05-25t18-33-11z" href="#server-v2-0-4-https-github-com-laurent22-joplin-releases-tag-server-v2-0-4-pre-release-2021-05-25t18-33-11z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.4">server-v2.0.4</a> - 2021-05-25T18:33:11Z<a name="server-v2-0-4-https-github-com-laurent22-joplin-releases-tag-server-v2-0-4-2021-05-25t18-33-11z" href="#server-v2-0-4-https-github-com-laurent22-joplin-releases-tag-server-v2-0-4-2021-05-25t18-33-11z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fixed Item and Log page when using Postgres (ee0f237)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.3">server-v2.0.3</a> (Pre-release) - 2021-05-25T18:08:46Z<a name="server-v2-0-3-https-github-com-laurent22-joplin-releases-tag-server-v2-0-3-pre-release-2021-05-25t18-08-46z" href="#server-v2-0-3-https-github-com-laurent22-joplin-releases-tag-server-v2-0-3-pre-release-2021-05-25t18-08-46z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.3">server-v2.0.3</a> - 2021-05-25T18:08:46Z<a name="server-v2-0-3-https-github-com-laurent22-joplin-releases-tag-server-v2-0-3-2021-05-25t18-08-46z" href="#server-v2-0-3-https-github-com-laurent22-joplin-releases-tag-server-v2-0-3-2021-05-25t18-08-46z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fixed handling of request origin (12a6634)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.2">server-v2.0.2</a> (Pre-release) - 2021-05-25T19:15:50Z<a name="server-v2-0-2-https-github-com-laurent22-joplin-releases-tag-server-v2-0-2-pre-release-2021-05-25t19-15-50z" href="#server-v2-0-2-https-github-com-laurent22-joplin-releases-tag-server-v2-0-2-pre-release-2021-05-25t19-15-50z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.2">server-v2.0.2</a> - 2021-05-25T19:15:50Z<a name="server-v2-0-2-https-github-com-laurent22-joplin-releases-tag-server-v2-0-2-2021-05-25t19-15-50z" href="#server-v2-0-2-https-github-com-laurent22-joplin-releases-tag-server-v2-0-2-2021-05-25t19-15-50z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add mailer service (ed8ee67)</li>
 <li>New: Add support for item size limit (6afde54)</li>
@@ -457,7 +571,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <li>Fixed: Fixed deleting a note that has been shared (489995d)</li>
 <li>Fixed: Make sure temp files are deleted after upload is done (#4540)</li>
 </ul>
-<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.1">server-v2.0.1</a> (Pre-release) - 2021-05-14T13:55:45Z<a name="server-v2-0-1-https-github-com-laurent22-joplin-releases-tag-server-v2-0-1-pre-release-2021-05-14t13-55-45z" href="#server-v2-0-1-https-github-com-laurent22-joplin-releases-tag-server-v2-0-1-pre-release-2021-05-14t13-55-45z" class="heading-anchor">🔗</a></h2>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.0.1">server-v2.0.1</a> - 2021-05-14T13:55:45Z<a name="server-v2-0-1-https-github-com-laurent22-joplin-releases-tag-server-v2-0-1-2021-05-14t13-55-45z" href="#server-v2-0-1-https-github-com-laurent22-joplin-releases-tag-server-v2-0-1-2021-05-14t13-55-45z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add support for sharing notes via a link (ccbc329)</li>
 <li>New: Add support for sharing a folder (#4772)</li>
@@ -483,41 +597,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/clipper/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/clipper.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Joplin Web Clipper | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -329,41 +334,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/config_screen/index.html

@@ -5,11 +5,11 @@
 
 !!! WARNING !!!
 
-This file was auto-generated from readme/nextcloud_app.md and any manual change
+This file was auto-generated from readme/config_screen.md and any manual change
 made to it will be overwritten. To make a change to this file please modify
 the source Markdown file:
 
-https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
+https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md
 
 -->
 
@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -37,8 +37,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
-		<title>Joplin Web API for Nextcloud | Joplin</title>
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<title>Configuration screen | Joplin</title>
 
 		<script
 			src="&#x2F;js/jquery-3.6.0.min.js"
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -193,7 +197,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 		</div>
 	</div>
 </div>
-			<div class="help-page-container page-nextcloud_app">
+			<div class="help-page-container page-config_screen">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -285,50 +290,23 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 							<div class="donate-links">
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
-<h1>Joplin Web API for Nextcloud<a name="joplin-web-api-for-nextcloud" href="#joplin-web-api-for-nextcloud" class="heading-anchor">🔗</a></h1>
-<hr>
-<p><strong>IMPORTANT: THIS APPLICATION IS DEPRECATED AND WILL NO LONGER BE SUPPORTED FROM JOPLIN 1.6.x</strong></p>
-<p>It is <a href="https://discourse.joplinapp.org/t/joplin-web-api-for-nextcloud/4491/72?u=laurent">deprecated</a> in favour of <a href="https://discourse.joplinapp.org/t/joplin-server-pre-release-is-now-available/13605">Joplin Server</a>, so if you are relying on it please do not upgrade to Joplin 1.6.x till you are ready to migrate to Joplin Server or some other alternative.</p>
-<hr>
-<p><strong>This is a beta feature, not yet completed. More info coming soon!</strong></p>
-<p>The app can be downloaded from there: <a href="https://apps.nextcloud.com/apps/joplin">https://apps.nextcloud.com/apps/joplin</a></p>
-<p>The Joplin Web API for Nextcloud is a helper application that enables certain features that are not possible otherwise. In particular:</p>
-<ul>
-<li>Sharing a note publicly</li>
-<li>Sharing a note with another Joplin user (who uses the same Nextcloud instance)</li>
-<li>Collaborating on a note</li>
-<li>Sharing a notebook</li>
-</ul>
-<h2>FAQ<a name="faq" href="#faq" class="heading-anchor">🔗</a></h2>
-<blockquote>
-<p>Does it work with encrypted notes?</p>
-</blockquote>
-<p>No</p>
-<blockquote>
-<p>Does it render images and other attachments?</p>
-</blockquote>
-<p>No</p>
-<blockquote>
-<p>How about math formulas?</p>
-</blockquote>
-<p>No</p>
-<blockquote>
-<p>Can I share a notebook?</p>
-</blockquote>
-<p>No</p>
-<blockquote>
-<p>Can I edit a shared note directly on the browser?</p>
-</blockquote>
-<p>No</p>
-<h2>TODO<a name="todo" href="#todo" class="heading-anchor">🔗</a></h2>
-<ul>
-<li>[ ] Handle encrypted notes (shared notes will be unencrypted on server)</li>
-<li>[ ] Move Joplin note renderer to separate package and re-use it to render notes in the Nextcloud app</li>
-<li>[ ] Allow editing note in browser</li>
-</ul>
+<h1>Configuration screen<a name="configuration-screen" href="#configuration-screen" class="heading-anchor">🔗</a></h1>
+<p>Opening the configuration screen depends on the application and sometimes operating system your are using.</p>
+<h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
+<p>As a shortcut you can press <kbd>Ctrl</kbd>+<kbd>,</kbd> on Windows and Linux, or <kbd>Cmd</kbd>+<kbd>,</kbd> on macOS.</p>
+<h3>Windows and Linux<a name="windows-and-linux" href="#windows-and-linux" class="heading-anchor">🔗</a></h3>
+<p>In the menu, click on <strong>Tools &gt; Options</strong>.</p>
+<p>Or press <kbd>Ctrl</kbd>+<kbd>,</kbd>.</p>
+<h3>macOS<a name="macos" href="#macos" class="heading-anchor">🔗</a></h3>
+<p>In the menu, click on <strong>Joplin &gt; Preferences</strong></p>
+<p>Or press <kbd>Cmd</kbd>+<kbd>,</kbd>.</p>
+<h2>Mobile application<a name="mobile-application" href="#mobile-application" class="heading-anchor">🔗</a></h2>
+<p>Tap on the <strong>burger icon ≡</strong> in the top left corner, and select <strong>Configuration</strong>.</p>
+<h2>CLI<a name="cli" href="#cli" class="heading-anchor">🔗</a></h2>
+<p>Type <code>:help config</code> for information on how to set config values nad for the complete list of available options.</p>
 
 								<div class="bottom-links">
-									<a href="https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md">
+									<a href="https://github.com/laurent22/joplin/blob/dev/readme/config_screen.md">
 										<i class="fab fa-github"></i> Improve this doc
 									</a>
 								</div>
@@ -337,41 +315,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/conflict/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/conflict.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>What is a conflict? | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -286,7 +291,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>What is a conflict?<a name="what-is-a-conflict" href="#what-is-a-conflict" class="heading-anchor">🔗</a></h1>
-<p>A conflict happens when one note or one attachment is modified in two different places, and then synchronised. In that case, it not possible to determine which version of the note or attachment you want to keep, and thus a conflict is generated.</p>
+<p>A conflict happens when one note or one attachment is modified in two different places, and then synchronised. In that case, it is not possible to determine which version of the note or attachment you want to keep, and thus a conflict is generated.</p>
 <h1>What happens in case of a conflict?<a name="what-happens-in-case-of-a-conflict" href="#what-happens-in-case-of-a-conflict" class="heading-anchor">🔗</a></h1>
 <p>When Joplin detects a conflict, the local note is copied to the Conflict notebook so as to avoid any data loss. Then the remote note is downloaded. You can then inspect the notes in the Conflict notebook, compare it with your other version, and copy any change that might have been overwritten.</p>
 <h1>How to avoid conflicts?<a name="how-to-avoid-conflicts" href="#how-to-avoid-conflicts" class="heading-anchor">🔗</a></h1>
@@ -305,41 +310,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/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 {
@@ -113,6 +121,10 @@ blockquote {
 	font-size: 16px !important;
 }
 
+.button-link {
+	white-space: nowrap;
+}
+
 .sponsor-button i {
 	font-size: 0.8em;
 }
@@ -287,6 +299,12 @@ 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;
 }
@@ -565,7 +583,7 @@ p,
 
 /* footer section  */
 footer {
-	padding-top: 50px;
+	padding-top: 30px;
 	padding-bottom: 30px;
 	position: absolute;
 	bottom: 0;
@@ -576,6 +594,7 @@ footer a,
 footer p {
 	color: #90b1d9;
 	text-decoration: none;
+	margin-bottom: 0;
 }
 
 footer a:hover {
@@ -599,6 +618,35 @@ 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;
+}
+
 /*****************************************************************
  IN THE PRESS
  The "In the press" section height needs to be adjusted as the
@@ -661,7 +709,7 @@ footer .right-links a {
 	#main-container {
 		position: relative;
 		min-height: 100vh;
-		padding-bottom: 260px;
+		padding-bottom: 130px;
 	}
 
 	.front-page h1 {
@@ -848,7 +896,7 @@ footer .right-links a {
 
 .help-page-container {
 	padding-top: 90px;
-	padding-bottom: 50px;
+	padding-bottom: 70px;
 }
 
 .donate-links {
@@ -862,7 +910,7 @@ footer .right-links a {
 	border-radius: 20px;
 	padding: 30px 20px;
 	padding-bottom: 30px;
-	margin-bottom: 50px;
+	margin-bottom: 20px;
 	margin-top: 40px;
 }
 
@@ -887,7 +935,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;
 }
 
@@ -905,6 +953,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;
@@ -947,6 +1000,7 @@ footer .right-links a {
 
 .price-row .plan-type img {
 	width: 65px;
+	margin-bottom: 0;
 }
 
 .price-row .plan-price {

docs/debugging/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/debugging.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>How to enable debugging | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -288,7 +293,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <h1>How to enable debugging<a name="how-to-enable-debugging" href="#how-to-enable-debugging" class="heading-anchor">🔗</a></h1>
 <p>It is possible to get the apps to display or log more information that might help debug various issues.</p>
 <h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
-<p>If the application starts with a white screen, open <strong>View &gt; Toggle Developer Tools</strong> in the menu. Then check in the console if there is any error or warning and please let us know about it.</p>
+<p>If the application starts with a white screen, open <strong>Help &gt; Toggle Development Tools</strong> in the menu. Then check in the console if there is any error or warning and please let us know about it.</p>
 <p>Otherwise, follow these instructions:</p>
 <ul>
 <li>Click on menu <strong>Help &gt; Open Profile Directory</strong> and add a file named &quot;flags.txt&quot; in your directory with the following content: <code>--open-dev-tools --debug --log-level debug</code></li>
@@ -303,7 +308,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 </ul>
 <h2>Mobile application<a name="mobile-application" href="#mobile-application" class="heading-anchor">🔗</a></h2>
 <ul>
-<li>In the Configuration screen, press on the <strong>Log button</strong> and post a screenshot of any error/warning.</li>
+<li>In the <a href="/config_screen/">Configuration screen</a>, press on the <strong>Log button</strong> and post a screenshot of any error/warning.</li>
 </ul>
 <h1>Creating a low-level bug report on Android<a name="creating-a-low-level-bug-report-on-android" href="#creating-a-low-level-bug-report-on-android" class="heading-anchor">🔗</a></h1>
 <p><a href="https://developer.android.com/studio/debug/bug-report">https://developer.android.com/studio/debug/bug-report</a></p>
@@ -353,41 +358,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/desktop/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/desktop.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Desktop application | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -299,41 +304,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/donate/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/donate.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Support Joplin development | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -315,9 +320,18 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <h2>Other way to support the development<a name="other-way-to-support-the-development" href="#other-way-to-support-the-development" class="heading-anchor">🔗</a></h2>
 <p>Finally, there are other ways to support the development of Joplin:</p>
 <ul>
-<li>Consider rating the app on <a href="https://play.google.com/store/apps/details?id=net.cozic.joplin&amp;utm_source=GitHub&amp;utm_campaign=README&amp;pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1">Google Play</a> or <a href="https://itunes.apple.com/us/app/joplin/id1315599797">App Store</a>.</li>
-<li>Vote for or review the app on <a href="https://alternativeto.net/software/joplin/about/">alternativeTo</a> or <a href="https://www.producthunt.com/posts/joplin">Product Hunt</a>.</li>
-<li><a href="https://joplinapp.org/help/#localisation">Create or update a translation</a>.</li>
+<li>
+<p>Consider rating the app on <a href="https://play.google.com/store/apps/details?id=net.cozic.joplin&amp;utm_source=GitHub&amp;utm_campaign=README&amp;pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1">Google Play</a> or <a href="https://itunes.apple.com/us/app/joplin/id1315599797">App Store</a>.</p>
+</li>
+<li>
+<p>Vote for or review the app on <a href="https://alternativeto.net/software/joplin/about/">alternativeTo</a> or <a href="https://www.producthunt.com/posts/joplin">Product Hunt</a>.</p>
+</li>
+<li>
+<p><a href="https://joplinapp.org/prereleases/">Help us test pre-releases</a>.</p>
+</li>
+<li>
+<p><a href="https://en.wikipedia.org/wiki/Joplin_(software)">Improve the Wikipedia article</a>.</p>
+</li>
 </ul>
 
 								<div class="bottom-links">
@@ -330,41 +344,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/download/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/download.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>Downloading Joplin... | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -131,7 +134,7 @@ Your download of <span class="downloaded-filename">Joplin</span> is in progress.
 <div class="get-it-desktop">
 <h2>Joplin App for Desktop<a name="joplin-app-for-desktop" href="#joplin-app-for-desktop" class="heading-anchor">🔗</a></h2>
 <p>Access your notes on Windows, macOS or Linux.</p>
-<!-- DESKTOP-DOWNLOAD-LINKS --><a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-Setup-2.1.9.exe'><img alt='Get it on Windows' width="134px" src='/images/BadgeWindows.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.dmg'><img alt='Get it on macOS' width="134px" src='/images/BadgeMacOS.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.AppImage'><img alt='Get it on Linux' width="134px" src='/images/BadgeLinux.png'/></a><!-- DESKTOP-DOWNLOAD-LINKS -->
+<!-- DESKTOP-DOWNLOAD-LINKS --><a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-Setup-2.4.12.exe'><img alt='Get it on Windows' width="134px" src='/images/BadgeWindows.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.dmg'><img alt='Get it on macOS' width="134px" src='/images/BadgeMacOS.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.4.12/Joplin-2.4.12.AppImage'><img alt='Get it on Linux' width="134px" src='/images/BadgeLinux.png'/></a><!-- DESKTOP-DOWNLOAD-LINKS -->
 </div>
 <h2>Joplin App for Mobile<a name="joplin-app-for-mobile" href="#joplin-app-for-mobile" class="heading-anchor">🔗</a></h2>
 <p>Access your notes on your phone or tablet from the Android and iOS apps.</p>
@@ -149,41 +152,36 @@ Your download of <span class="downloaded-filename">Joplin</span> is in progress.
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/e2ee/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/e2ee.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>About End-To-End Encryption (E2EE) | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -317,41 +322,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/external_links/index.html

@@ -0,0 +1,356 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<!--
+
+!!! WARNING !!!
+
+This file was auto-generated from readme/external_links.md and any manual change
+made to it will be overwritten. To make a change to this file please modify
+the source Markdown file:
+
+https://github.com/laurent22/joplin/blob/dev/readme/external_links.md
+
+-->
+
+	<head>
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
+			charset="utf-8"
+			http-equiv="X-UA-Compatible"
+			content="IE=edge,chrome=1"
+		/>
+		<link rel="icon" href="&#x2F;images/favicon.png" />
+		<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="&#x2F;css/bootstrap5.0.2.min.css"
+			as="style"
+		/>
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
+		<link
+			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
+			rel="stylesheet"
+			as="style"
+			media="all"
+			onload="this.media='all'; this.onload = null"
+		/>
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
+		<title>External URL links | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
+	</head>
+	<body class="website-env-prod">
+		<div class="container-fluid generic-template -page" id="main-container">
+
+<div class=" navbar-main white-bg" id="nav-section">
+	<div class="container">
+		<div class="row">
+			<div class="col-3">
+				<a href="/">
+					<img
+						src="&#x2F;images/logo-text-blue.svg"
+						alt=""
+						id="top-logo"
+						width="180"
+					/>
+				</a>
+			</div>
+			<div class="col-9 text-right d-none d-md-block">
+				<a href="/help/" class="fw500">Help</a>
+				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>			</div>
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
+				<span class="pointer"
+					><img
+						src="&#x2F;images/mobile-menu-black-open-icon.png"
+						id="open-menu-mobile"
+						alt=""
+				/></span>
+				&nbsp;&nbsp;
+
+				<div id="menu-mobile">
+					<div>
+						<div class="text-right">
+							<img
+								src="&#x2F;images/close-icon.png"
+								alt=""
+								class="pointer"
+								id="close-menu-mobile"
+							/>
+						</div>
+
+						<div class="text-center menu-mobile-top">
+							<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500 mobile-menu-link">Forum</a>
+							<a href="/help/" class="fw500 mobile-menu-link">Help</a>
+						</div>
+
+						<div class="menu-mobile-buttons">
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>						</div>
+					</div>
+
+						<div id="toc-mobile"><div><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="/desktop/">Desktop application</a></li>
+<li><a href="/mobile/">Mobile applications</a></li>
+<li><a href="/terminal/">Terminal application</a></li>
+<li><a href="/clipper/">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
+<li><a href="/markdown/">Markdown Guide</a></li>
+<li><a href="/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="/conflict/">What is a conflict?</a></li>
+<li><a href="/debugging/">How to enable debug mode</a></li>
+<li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
+<li><a href="/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="/api/overview/">Joplin API Overview</a></li>
+<li><a href="/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
+<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
+<li><a href="/api/references/rest_api/">Data API</a></li>
+<li><a href="/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="/api/references/plugin_theming/">Plugin theming</a></li>
+</ul>
+</li>
+<li>
+<p>Development</p>
+<ul>
+<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
+<li><a href="/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="/spec/history/">Note History spec</a></li>
+<li><a href="/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="/spec/search_sorting/">Search Sorting spec</a></li>
+<li><a href="/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2021</p>
+<ul>
+<li><a href="/gsoc2021/index/">Google Summer of Code 2021</a></li>
+<li><a href="/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
+<li><a href="/gsoc2021/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="/changelog_server/">Changelog (Server)</a></li>
+<li><a href="/stats/">Stats</a></li>
+<li><a href="/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div></div>
+					
+					<div>
+						<p class="light-blue mobile-menu-link-bottom text-center">
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
+							<br/>
+							<a href="/privacy/" class="fw500">Privacy Policy</a>
+						</p>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+			<div class="help-page-container page-external_links">
+				<div class="container">
+					<div class="row content-wrapper">
+						<div id="toc"><div><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="/desktop/">Desktop application</a></li>
+<li><a href="/mobile/">Mobile applications</a></li>
+<li><a href="/terminal/">Terminal application</a></li>
+<li><a href="/clipper/">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
+<li><a href="/markdown/">Markdown Guide</a></li>
+<li><a href="/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="/conflict/">What is a conflict?</a></li>
+<li><a href="/debugging/">How to enable debug mode</a></li>
+<li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
+<li><a href="/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="/api/overview/">Joplin API Overview</a></li>
+<li><a href="/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - References</p>
+<ul>
+<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
+<li><a href="/api/references/rest_api/">Data API</a></li>
+<li><a href="/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="/api/references/plugin_theming/">Plugin theming</a></li>
+</ul>
+</li>
+<li>
+<p>Development</p>
+<ul>
+<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
+<li><a href="/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="/spec/history/">Note History spec</a></li>
+<li><a href="/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="/spec/search_sorting/">Search Sorting spec</a></li>
+<li><a href="/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2021</p>
+<ul>
+<li><a href="/gsoc2021/index/">Google Summer of Code 2021</a></li>
+<li><a href="/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
+<li><a href="/gsoc2021/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="/changelog_server/">Changelog (Server)</a></li>
+<li><a href="/stats/">Stats</a></li>
+<li><a href="/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div></div>
+
+						<div class="main-content">
+							<div class="alert alert-danger alert-env-dev" role="alert">
+								Running in prod mode!
+							</div>
+							<div class="donate-links">
+<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
+</div>
+<h1>External URL links<a name="external-url-links" href="#external-url-links" class="heading-anchor">🔗</a></h1>
+<p>This feature allows creation of links to notes, folder, and tags. When opening such link Joplin will start, unless it's already running, and open the corresponding item.</p>
+<p>To create a link, right click a note, a folder, or a tag in the sidebar and select &quot;Copy external link&quot;. The link will be copied to clipboard.</p>
+<h2>Link format<a name="link-format" href="#link-format" class="heading-anchor">🔗</a></h2>
+<ul>
+<li><code>joplin://x-callback-url/openNote?id=&lt;note id&gt;</code> for note</li>
+<li><code>joplin://x-callback-url/openFolder?id=&lt;folder id&gt;</code> for folder</li>
+<li><code>joplin://x-callback-url/openTag?id=&lt;tag id&gt;</code> for tag</li>
+</ul>
+<h2>Known problems<a name="known-problems" href="#known-problems" class="heading-anchor">🔗</a></h2>
+<p>On macOS if Joplin isn't running it will start but it won't open the note.</p>
+
+								<div class="bottom-links">
+									<a href="https://github.com/laurent22/joplin/blob/dev/readme/external_links.md">
+										<i class="fab fa-github"></i> Improve this doc
+									</a>
+								</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			
+<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://discordapp.com/invite/d2HMPwE" 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-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
+
+<script>
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
+</script>	</body>
+</html>

docs/faq/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/faq.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>FAQ | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -395,41 +400,36 @@ on this server.&lt;/p&gt;
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {

docs/faq_joplin_cloud/index.html

@@ -29,7 +29,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 			href="/css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628514896838">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1635175432192">
 		<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/readme/faq_joplin_cloud.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628514896838" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1635175432192" as="style" />
 		<title>FAQ | Joplin</title>
 
 		<script
@@ -68,7 +68,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 <a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
 	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
-			<div class="col-9 text-right d-block d-md-none">
+			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
+<a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
+</a>
 				<span class="pointer"
 					><img
 						src="&#x2F;images/mobile-menu-black-open-icon.png"
@@ -118,6 +121,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -215,6 +219,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 <li><a href="/conflict/">What is a conflict?</a></li>
 <li><a href="/debugging/">How to enable debug mode</a></li>
 <li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="/external_links/">External links</a></li>
 <li><a href="/faq/">FAQ</a></li>
 </ul>
 </li>
@@ -287,7 +292,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 </div>
 <h1>FAQ<a name="faq" href="#faq" class="heading-anchor">🔗</a></h1>
 <h2>What is Joplin Cloud?<a name="what-is-joplin-cloud" href="#what-is-joplin-cloud" class="heading-anchor">🔗</a></h2>
-<p>Joplin Cloud allows you to synchronise your notes automatically to all your devices. Moreover, this service gives you access to additional features:</p>
+<p><a href="https://joplincloud.com">Joplin Cloud</a> allows you to synchronise your notes automatically to all your devices. Moreover, this service gives you access to additional features:</p>
 <ul>
 <li>
 <p>Publish a note to the internet and share it with others. The published note will be updated automatically whenever you make a change.</p>
@@ -299,11 +304,11 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 <p>Improved sync performances. Compared to other sync options, Joplin Cloud, being developed specifically for Joplin, is faster and consumes less resources.</p>
 </li>
 </ul>
-<p>Moreover, by getting a subscription you are supporting the development of the project as a whole, including the open source applications. Such support needed in the long term to provide bug and security fixes, add new features, and provide support.</p>
+<p>Moreover, by getting a subscription you are supporting the development of the project as a whole, including the open source applications. Such support is needed in the long term to provide bug and security fixes, add new features, and provide support.</p>
 <h2>What if I exceed the storage space?<a name="what-if-i-exceed-the-storage-space" href="#what-if-i-exceed-the-storage-space" class="heading-anchor">🔗</a></h2>
 <p>If you exceed the storage space, you will not be able to upload new notes. You may however delete notes and attachments so as to free up space. If you are on a Basic plan, you may also upgrade to Pro. If you are on a Pro or Business plan please contact us and let us know that you need more space and we will increase your storage space.</p>
 <h2>Do you offer discounts?<a name="do-you-offer-discounts" href="#do-you-offer-discounts" class="heading-anchor">🔗</a></h2>
-<p>We offer a 50% discount to students. To claim it, please <a href="mailto:support@joplincloud.com">contact us</a> from your university or school email address. You will then receive a URL you can use to subscribe to Joplin Cloud while benefiting from the 50% discount. This is valid for a whole year and can be renewed for as long as you are in education by contacting us again.</p>
+<p>We offer a 50% Education Discount for students and teachers. To claim it, please <a href="mailto:support@joplincloud.com">contact us</a> from your university or school email address. You will then receive a URL you can use to subscribe to Joplin Cloud while benefiting from the 50% discount. This is valid for a whole year and can be renewed for as long as you are in education by contacting us again.</p>
 <p>We may also offer bulk discounts for companies, associations and nonprofit organisations. Please <a href="mailto:support@joplincloud.com">contact us</a> for more details.</p>
 
 								<div class="bottom-links">
@@ -316,41 +321,36 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 				</div>
 			</div>
 
-			<footer class="darkblue-bg">
-				<div class="container">
-					<div class="row">
-						<div class="col-3 d-none d-md-block">
-							<img src="&#x2F;images/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="&#x2F;images/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-2021 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="/privacy/">Privacy Policy</a>
-							</p>
-						</div>
-					</div>
-				</div>
-			</footer>
+			
+<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://discordapp.com/invite/d2HMPwE" 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>
 
-		<script src="&#x2F;js/script.js?t=1628514896838"></script>
+		<div class="row bottom-links-row">
+			<div class="col-12 col-md-6">
+				<p class="text-center-sm">Copyright &copy; 2016-2021 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="/privacy/">Privacy Policy</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</footer>		</div>
+
+		<script src="&#x2F;js/script.js?t=1635175432192"></script>
 
 <script>
 	if (window.location.hostname !== 'localhost') {