Desktop release v3.0.14

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "3.0.13",
+  "version": "3.0.14",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,

packages/app-mobile/android/app/build.gradle

@@ -79,8 +79,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097746
-		versionName "3.0.7"
+		versionCode 2097747
+		versionName "3.0.8"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}

packages/app-mobile/components/NoteBodyViewer/bundledJs/noteBodyViewerBundle.ts

@@ -1,16 +1,17 @@
 
 import WebViewToRNMessenger from '../../../utils/ipc/WebViewToRNMessenger';
-import { NoteViewerLocalApi, NoteViewerRemoteApi, RendererWebViewOptions } from './types';
+import { NoteViewerLocalApi, NoteViewerRemoteApi, RendererWebViewOptions, WebViewLib } from './types';
 import Renderer from './Renderer';
 
 declare global {
 	interface Window {
 		rendererWebViewOptions: RendererWebViewOptions;
+		webviewLib: WebViewLib;
 	}
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
-declare const webviewLib: any;
+declare const webviewLib: WebViewLib;
 
 const messenger = new WebViewToRNMessenger<NoteViewerLocalApi, NoteViewerRemoteApi>(
 	'note-viewer',
@@ -33,6 +34,8 @@ webviewLib.initialize({
 	},
 });
 
+window.webviewLib = webviewLib;
+
 const renderer = new Renderer({
 	...window.rendererWebViewOptions,
 	fsDriver: messenger.remoteApi.fsDriver,

packages/app-mobile/components/NoteBodyViewer/bundledJs/types.ts

@@ -31,3 +31,8 @@ export interface NoteViewerRemoteApi {
 	onPostPluginMessage(contentScriptId: string, message: any): Promise<any>;
 	fsDriver: RendererFsDriver;
 }
+
+export interface WebViewLib {
+	initialize(config: unknown): void;
+}
+

packages/app-mobile/components/screens/Note.tsx

@@ -574,18 +574,10 @@ class NoteScreenComponent extends BaseScreenComponent<Props, State> implements B
 
 			this.props.dispatch({
 				type: 'NAV_GO',
-				routeName: 'Notes',
-				folderId: this.state.note.parent_id,
+				routeName: 'Note',
+				noteId: noteId,
+				noteHash: noteHash,
 			});
-
-			shim.setTimeout(() => {
-				this.props.dispatch({
-					type: 'NAV_GO',
-					routeName: 'Note',
-					noteId: noteId,
-					noteHash: noteHash,
-				});
-			}, 5);
 		}
 	}
 
@@ -1688,6 +1680,16 @@ class NoteScreenComponent extends BaseScreenComponent<Props, State> implements B
 	}
 }
 
+// We added this change to reset the component state when the props.noteId is changed.
+// NoteScreenComponent original implementation assumed that noteId would never change,
+// which can cause some bugs where previously set state to another note would interfere
+// how the new note should be rendered
+const NoteScreenWrapper = (props: Props) => {
+	return (
+		<NoteScreenComponent key={props.noteId} {...props} />
+	);
+};
+
 const NoteScreen = connect((state: AppState) => {
 	return {
 		noteId: state.selectedNoteIds.length ? state.selectedNoteIds[0] : null,
@@ -1711,6 +1713,6 @@ const NoteScreen = connect((state: AppState) => {
 		// confusing.
 		useEditorBeta: !state.settings['editor.usePlainText'],
 	};
-})(NoteScreenComponent);
+})(NoteScreenWrapper);
 
 export default NoteScreen;

packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj

@@ -503,13 +503,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 119;
+				CURRENT_PROJECT_VERSION = 120;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 13.0.5;
+				MARKETING_VERSION = 13.0.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -534,12 +534,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 119;
+				CURRENT_PROJECT_VERSION = 120;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 13.0.5;
+				MARKETING_VERSION = 13.0.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -724,14 +724,14 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 119;
+				CURRENT_PROJECT_VERSION = 120;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 13.0.5;
+				MARKETING_VERSION = 13.0.6;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = (
@@ -762,14 +762,14 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 119;
+				CURRENT_PROJECT_VERSION = 120;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 13.0.5;
+				MARKETING_VERSION = 13.0.6;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

packages/tools/git-changelog.ts

@@ -269,7 +269,9 @@ function filterLogs(logs: LogEntry[], platform: Platform) {
 		// but that's not useful in a changelog especially since most people
 		// don't know country and language codes. So we catch all these and
 		// bundle them all up in a single "Updated translations" at the end.
-		if (log.message.match(/Translation:\sUpdate\s.*?(\.po|[a-zA-Z][a-zA-Z]|[a-zA-Z][a-zA-Z]_[a-zA-Z][a-zA-Z])/)) {
+		if (log.message.match(/Translation:\sUpdate\s.*?(\.po|[a-zA-Z][a-zA-Z]|[a-zA-Z][a-zA-Z]_[a-zA-Z][a-zA-Z])/)
+			|| log.message.match(/Update.+\.po/)
+		) {
 			// updatedTranslations = true;
 			addIt = false;
 		}

packages/tools/locales/de_DE.po

@@ -20,20 +20,21 @@ msgstr ""
 
 #: packages/app-mobile/components/screens/ConfigScreen/ConfigScreen.tsx:600
 msgid "- Camera: to allow taking a picture and attaching it to a note."
-msgstr "- Kamera: um ein Bild aufzunehmen und an eine Notiz anzuhängen."
+msgstr ""
+"- Kamera: Erlaubt das Aufnehmen eines Bildes zum Anhängen an eine Notiz."
 
 #: packages/app-mobile/components/screens/ConfigScreen/ConfigScreen.tsx:603
 msgid "- Location: to allow attaching geo-location information to a note."
 msgstr ""
-"- Standort: zum Anhängen von Geolokalisierungsinformationen an eine Notiz."
+"- Standort: Erlaubt das Anhängen von Standortinformationen an eine Notiz."
 
 #: packages/app-mobile/components/screens/ConfigScreen/ConfigScreen.tsx:597
 msgid ""
 "- Storage: to allow attaching files to notes and to enable filesystem "
 "synchronisation."
 msgstr ""
-"- Speicher: um das Anhängen von Dateien an Notizen und die Synchronisation "
-"des Dateisystems zu ermöglichen."
+"- Speicher: Erlaubt das Anhängen von Dateien an Notizen und die "
+"Synchronisation des Dateisystems."
 
 #: packages/lib/services/KeymapService.ts:322
 #: packages/lib/services/KeymapService.ts:328
@@ -197,8 +198,8 @@ msgid ""
 "%s is not optimised for synchronising many small files so your initial "
 "synchronisation will be slow."
 msgstr ""
-"%s ist nicht für die Synchronisation vieler kleiner Dateien optimiert, "
-"wodurch die erste Synchronisation langsam sein wird."
+"%s wurde nicht für die Synchronisation vieler kleiner Dateien optimiert, "
+"wodurch die erste Synchronisation lange dauern wird."
 
 #: packages/app-mobile/plugins/PluginRunner/dialogs/PluginPanelViewer.tsx:75
 msgid "%s tab opened"
@@ -309,8 +310,7 @@ msgstr "Zugriff verweigert: Bitte überprüfe Benutzername und Passwort"
 #: packages/lib/WebDavApi.js:449
 msgid "Access denied: Please re-enter your password and/or username"
 msgstr ""
-"Zugriff verweigert: Bitte trage dein Passwort und/oder Benutzername erneut "
-"ein"
+"Zugriff verweigert: Bitte gib dein Passwort und/oder Benutzername erneut ein"
 
 #: packages/server/src/routes/admin/users.ts:144
 msgid "Account"
@@ -319,12 +319,12 @@ msgstr "Konto"
 #: packages/app-desktop/gui/JoplinCloudConfigScreen.tsx:31
 #: packages/app-mobile/components/screens/ConfigScreen/JoplinCloudConfig.tsx:48
 msgid "Account information"
-msgstr "Konto-Informationen"
+msgstr "Kontoinformationen"
 
 #: packages/app-desktop/gui/JoplinCloudConfigScreen.tsx:35
 #: packages/app-mobile/components/screens/ConfigScreen/JoplinCloudConfig.tsx:51
 msgid "Account type"
-msgstr "Konto-Art"
+msgstr "Kontoart"
 
 #: packages/app-desktop/gui/ResourceScreen.tsx:106
 msgid "Action"
@@ -601,7 +601,7 @@ msgstr "Automatisch"
 
 #: packages/server/src/services/TaskService.ts:30
 msgid "Auto-add disabled accounts for deletion"
-msgstr "Automatisches Hinzufügen deaktivierter Accounts zur Löschliste"
+msgstr "Automatisches Hinzufügen deaktivierter Konten zur Löschliste"
 
 #: packages/lib/models/Setting.ts:998
 msgid "Auto-pair braces, parentheses, quotations, etc."
@@ -2276,11 +2276,11 @@ msgstr "Fokus"
 
 #: packages/lib/models/Setting.ts:1153 packages/lib/models/Setting.ts:1170
 msgid "Focus body"
-msgstr "Inhalt fokussieren"
+msgstr "Cursor auf Inhalt"
 
 #: packages/lib/models/Setting.ts:1152 packages/lib/models/Setting.ts:1169
 msgid "Focus title"
-msgstr "Titel fokussieren"
+msgstr "Cursor auf Titel"
 
 #: packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/ExportProfileButton.tsx:38
 msgid "For debugging purpose only: export your profile to an external SD card."
@@ -2309,8 +2309,8 @@ msgstr ""
 msgid ""
 "For the list of keyboard shortcuts and config options, type `help keymap`"
 msgstr ""
-"Um die komplette Liste aller verfügbaren Tastenkürzel und "
-"Konfigurationseinstellungen anzuzeigen, tippe `help keymap` ein"
+"Um die Liste aller verfügbaren Tastenkürzel und Konfigurationseinstellungen "
+"anzuzeigen, tippe `help keymap` ein"
 
 #: packages/lib/models/Setting.ts:678
 msgid "Force path style"
@@ -2359,12 +2359,12 @@ msgstr[1] "Links erzeugen..."
 #: packages/lib/models/Setting.ts:2845
 msgid "Geolocation, spellcheck, editor toolbar, image resize"
 msgstr ""
-"Geolokalisierung, Rechtschreibprüfung, Editor-Symbolleiste, "
-"Bildgrößenanpassung"
+"Standortdaten, Rechtschreibprüfung, Editor-Symbolleiste, Anpassung der "
+"Bildgröße"
 
 #: packages/app-desktop/gui/ExtensionBadge.tsx:93
 msgid "Get it now:"
-msgstr "Hole es jetzt:"
+msgstr "Jetzt installieren:"
 
 #: packages/lib/models/Setting.ts:1481
 msgid "Get pre-releases when checking for updates"
@@ -2434,11 +2434,11 @@ msgstr "%s ausblenden"
 
 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:221
 msgid "Hide advanced"
-msgstr "Erweitertes verstecken"
+msgstr "Erweitertes ausblenden"
 
 #: packages/server/src/routes/admin/users.ts:206
 msgid "Hide disabled"
-msgstr "Deaktiviertes verstecken"
+msgstr "Deaktiviertes ausblenden"
 
 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:160
 msgid "Hide disabled keys"
@@ -3159,7 +3159,7 @@ msgstr "Master-Passwort:"
 
 #: packages/lib/models/Setting.ts:809
 msgid "Max concurrent connections"
-msgstr "Maximale Anzahl an gleichzeitigen Verbindungen"
+msgstr "Maximale Anzahl gleichzeitiger Verbindungen"
 
 #: packages/server/src/routes/admin/users.ts:148
 msgid "Max Item Size"
@@ -4075,7 +4075,7 @@ msgstr "Mehr erfahren"
 
 #: packages/app-desktop/gui/NoteContentPropertiesDialog.tsx:159
 msgid "Read time: %s min"
-msgstr "Lese-Zeit: %s Min"
+msgstr "Lesezeit: %s min"
 
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:312
 msgid "Recipient has accepted the invitation"
@@ -4188,7 +4188,7 @@ msgstr "Betrügerische Erweiterung melden"
 
 #: packages/app-mobile/components/screens/ConfigScreen/plugins/EnablePluginSupportPage.tsx:116
 msgid "Report system"
-msgstr "Meldesytem"
+msgstr "Meldesystem"
 
 #: packages/server/src/services/MustacheService.ts:137
 msgid "Reports"
@@ -4440,7 +4440,7 @@ msgstr "Eltern-Notizbuch auswählen"
 
 #: packages/app-desktop/gui/MenuBar.tsx:351
 msgid "Send bug report"
-msgstr "Fehlerprotokoll senden"
+msgstr "Fehlerbericht senden"
 
 #: packages/app-cli/app/command-server.js:38
 msgid "Server is already running on port %d"
@@ -4679,7 +4679,7 @@ msgstr "Sortiere Notizen nach"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:138
 msgid "Sort selected lines"
-msgstr "Ausgewählte Zeilen bearbeiten"
+msgstr "Ausgewählte Zeilen sortieren"
 
 #: packages/app-cli/app/command-ls.ts:29
 msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
@@ -5441,7 +5441,7 @@ msgstr[1] "Diese Notizen konnten nicht verschoben werden: %s"
 
 #: packages/lib/models/Note.ts:128
 msgid "This note does not have geolocation information."
-msgstr "Diese Notiz hat keine Standort-Informationen."
+msgstr "Diese Notiz hat keine Standortdaten."
 
 #: packages/app-mobile/components/screens/Note.tsx:210
 msgid "This note has been modified:"
@@ -5641,7 +5641,7 @@ msgstr "Entwicklerwerkzeuge umschalten"
 
 #: packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.ts:6
 msgid "Toggle editor layout"
-msgstr "Editor-Layout umschalten"
+msgstr "Editorlayout umschalten"
 
 #: packages/app-desktop/gui/MainScreen/commands/toggleEditors.ts:8
 msgid "Toggle editors"
@@ -6032,8 +6032,7 @@ msgstr ""
 #: packages/app-mobile/components/screens/ConfigScreen/plugins/EnablePluginSupportPage.tsx:116
 msgid "We have a system for reporting and removing problematic plugins."
 msgstr ""
-"Wir haben ein System zur Meldung und Entfernung problematischer "
-"Erweiterungen."
+"Wir haben ein System zum Melden und Entfernen problematischer Erweiterungen."
 
 #: packages/app-mobile/components/screens/ConfigScreen/plugins/EnablePluginSupportPage.tsx:114
 msgid ""

readme/about/changelog/android.md

@@ -1,5 +1,9 @@
 # Joplin Android Changelog
 
+## [android-v3.0.8](https://github.com/laurent22/joplin/releases/tag/android-v3.0.8) (Pre-release) - 2024-07-06T10:26:06Z
+
+- Fixed: Fix sidebar performance regression with many nested notebooks (#10676) (#10674 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
+
 ## [android-v3.0.7](https://github.com/laurent22/joplin/releases/tag/android-v3.0.7) (Pre-release) - 2024-07-01T15:47:15Z
 
 - Improved: Set min version for synchronising to 3.0.0 (e4b8976)

readme/about/changelog/ios.md

@@ -1,5 +1,9 @@
 # Joplin iOS Changelog
 
+## [ios-v13.0.6](https://github.com/laurent22/joplin/releases/tag/ios-v13.0.6) - 2024-07-06T11:22:58Z
+
+- Fixed: Fix sidebar performance regression with many nested notebooks (#10676) (#10674 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
+
 ## [ios-v13.0.5](https://github.com/laurent22/joplin/releases/tag/ios-v13.0.5) - 2024-07-01T15:47:53Z
 
 - Improved: Set min version for synchronising to 3.0.0 (e4b8976)