Merge branch 'release-2.1' into dev

2024-11-27 08:21:03 +02:00 · 2021-06-27 15:29:35 +01:00 · 2021-06-27 15:29:35 +01:00 · 6a5629391b
commit 6a5629391b
parent 00b39e4671 b77f9388b0
29 changed files with 81 additions and 57 deletions
--- a/README.md
+++ b/README.md
@ -36,7 +36,7 @@ Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.0.11/J

 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://joplinapp.org/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.0.4/joplin-v2.0.4.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.0.4/joplin-v2.0.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://joplinapp.org/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.1.3/joplin-v2.1.3.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.1.3/joplin-v2.1.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://joplinapp.org/images/BadgeIOS.png'/></a> | -

 ## Terminal application
--- a/packages/app-cli/package-lock.json
+++ b/packages/app-cli/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "joplin",
-  "version": "2.0.1",
+  "version": "2.1.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/app-cli/package.json
+++ b/packages/app-cli/package.json
@ -32,7 +32,7 @@
    ],
    "owner": "Laurent Cozic"
  },
-  "version": "2.1.0",
+  "version": "2.1.1",
  "bin": {
    "joplin": "./main.js"
  },
--- a/packages/app-clipper/manifest.json
+++ b/packages/app-clipper/manifest.json
@ -1,7 +1,7 @@
 {
    "manifest_version": 2,
    "name": "Joplin Web Clipper [DEV]",
-    "version": "2.1.0",
+    "version": "2.1.1",
    "description": "Capture and save web pages and screenshots from your browser to Joplin.",
    "homepage_url": "https://joplinapp.org",
    "content_security_policy": "script-src 'self'; object-src 'self'",
--- a/packages/app-desktop/package-lock.json
+++ b/packages/app-desktop/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/app-desktop",
-  "version": "2.1.5",
+  "version": "2.1.7",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/app-desktop/package.json
+++ b/packages/app-desktop/package.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/app-desktop",
-  "version": "2.1.5",
+  "version": "2.1.7",
  "description": "Joplin for Desktop",
  "main": "main.js",
  "private": true,
--- a/packages/app-mobile/android/app/build.gradle
+++ b/packages/app-mobile/android/app/build.gradle
@ -141,8 +141,8 @@ android {
        applicationId "net.cozic.joplin"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097637
-		versionName "2.1.2"
+		versionCode 2097638
+		versionName "2.1.3"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
--- a/packages/app-mobile/components/screens/ConfigScreen.tsx
+++ b/packages/app-mobile/components/screens/ConfigScreen.tsx
@ -463,14 +463,13 @@ class ConfigScreenComponent extends BaseScreenComponent {
 		return output;
 	}

-	private renderFeatureFlags(settings: any): any[] {
+	private renderFeatureFlags(settings: any, featureFlagKeys: string[]): any[] {
 		const updateSettingValue = (key: string, value: any) => {
-			console.info('UPDATE', key, value);
 			return shared.updateSettingValue(this, key, value);
 		};

 		const output: any[] = [];
-		for (const key of Setting.featureFlagKeys(AppType.Mobile)) {
+		for (const key of featureFlagKeys) {
 			output.push(this.renderToggle(key, key, settings[key], updateSettingValue));
 		}
 		return output;
@ -508,8 +507,11 @@ class ConfigScreenComponent extends BaseScreenComponent {
 			}
 		}

-		settingComps.push(this.renderHeader('featureFlags', _('Feature flags')));
-		settingComps.push(<View key="featureFlagsContainer">{this.renderFeatureFlags(settings)}</View>);
+		const featureFlagKeys = Setting.featureFlagKeys(AppType.Mobile);
+		if (featureFlagKeys.length) {
+			settingComps.push(this.renderHeader('featureFlags', _('Feature flags')));
+			settingComps.push(<View key="featureFlagsContainer">{this.renderFeatureFlags(settings, featureFlagKeys)}</View>);
+		}

 		settingComps.push(this.renderHeader('moreInfo', _('More information')));

--- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
+++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
@ -486,13 +486,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 69;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.1.0;
+				MARKETING_VERSION = 12.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@ -514,12 +514,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 69;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.1.0;
+				MARKETING_VERSION = 12.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@ -659,14 +659,14 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 69;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.1.0;
+				MARKETING_VERSION = 12.1.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@ -690,14 +690,14 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 69;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.1.0;
+				MARKETING_VERSION = 12.1.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
--- a/packages/fork-htmlparser2/package-lock.json
+++ b/packages/fork-htmlparser2/package-lock.json
@ -1,6 +1,6 @@
 {
    "name": "@joplin/fork-htmlparser2",
-    "version": "4.1.27",
+    "version": "4.1.28",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
--- a/packages/fork-htmlparser2/package.json
+++ b/packages/fork-htmlparser2/package.json
@ -1,7 +1,7 @@
 {
  "name": "@joplin/fork-htmlparser2",
  "description": "Fast & forgiving HTML/XML/RSS parser",
-  "version": "4.1.27",
+  "version": "4.1.28",
  "author": "Felix Boehm <me@feedic.com>",
  "publishConfig": {
    "access": "public"
--- a/packages/fork-sax/package-lock.json
+++ b/packages/fork-sax/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/fork-sax",
-  "version": "1.2.31",
+  "version": "1.2.32",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fork-sax/package.json
+++ b/packages/fork-sax/package.json
@ -2,7 +2,7 @@
  "name": "@joplin/fork-sax",
  "description": "An evented streaming XML parser in JavaScript",
  "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
-  "version": "1.2.31",
+  "version": "1.2.32",
  "main": "lib/sax.js",
  "publishConfig": {
    "access": "public"
--- a/packages/lib/file-api-driver-joplinServer.ts
+++ b/packages/lib/file-api-driver-joplinServer.ts
@ -1,7 +1,6 @@
 import { MultiPutItem } from './file-api';
 import JoplinError from './JoplinError';
 import JoplinServerApi from './JoplinServerApi';
-import Setting from './models/Setting';
 import { trimSlashes } from './path-utils';

 // All input paths should be in the format: "path/to/file". This is converted to
@ -34,11 +33,11 @@ export default class FileApiDriverJoplinServer {
 	}

 	public get supportsMultiPut() {
-		return Setting.value('featureFlag.syncMultiPut');
+		return true;
 	}

 	public get supportsAccurateTimestamp() {
-		return Setting.value('featureFlag.syncAccurateTimestamps');
+		return true;
 	}

 	public requestRepeatCount() {
--- a/packages/lib/models/Setting.ts
+++ b/packages/lib/models/Setting.ts
@ -1261,19 +1261,19 @@ class Setting extends BaseModel {
 				storage: SettingStorage.Database,
 			},

-			'featureFlag.syncAccurateTimestamps': {
-				value: false,
-				type: SettingItemType.Bool,
-				public: false,
-				storage: SettingStorage.File,
-			},
+			// 'featureFlag.syncAccurateTimestamps': {
+			// 	value: false,
+			// 	type: SettingItemType.Bool,
+			// 	public: false,
+			// 	storage: SettingStorage.File,
+			// },

-			'featureFlag.syncMultiPut': {
-				value: false,
-				type: SettingItemType.Bool,
-				public: false,
-				storage: SettingStorage.File,
-			},
+			// 'featureFlag.syncMultiPut': {
+			// 	value: false,
+			// 	type: SettingItemType.Bool,
+			// 	public: false,
+			// 	storage: SettingStorage.File,
+			// },

 		};

--- a/packages/lib/package-lock.json
+++ b/packages/lib/package-lock.json
@ -1,6 +1,6 @@
 {
 	"name": "@joplin/lib",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/lib",
-  "version": "2.1.0",
+  "version": "2.1.1",
  "description": "Joplin Core library",
  "author": "Laurent Cozic",
  "homepage": "",
@ -25,11 +25,11 @@
    "typescript": "^4.0.5"
  },
  "dependencies": {
-    "@joplin/fork-htmlparser2": "^4.1.27",
-    "@joplin/fork-sax": "^1.2.31",
+    "@joplin/fork-htmlparser2": "^4.1.28",
+    "@joplin/fork-sax": "^1.2.32",
    "@joplin/renderer": "^1.8.2",
-    "@joplin/turndown": "^4.0.49",
-    "@joplin/turndown-plugin-gfm": "^1.0.31",
+    "@joplin/turndown": "^4.0.50",
+    "@joplin/turndown-plugin-gfm": "^1.0.32",
    "async-mutex": "^0.1.3",
    "aws-sdk": "^2.588.0",
    "base-64": "^0.1.0",
--- a/packages/plugin-repo-cli/package-lock.json
+++ b/packages/plugin-repo-cli/package-lock.json
@ -1,6 +1,6 @@
 {
 	"name": "@joplin/plugin-repo-cli",
-	"version": "2.0.3",
+	"version": "2.1.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/packages/plugin-repo-cli/package.json
+++ b/packages/plugin-repo-cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/plugin-repo-cli",
-  "version": "2.1.0",
+  "version": "2.1.1",
  "description": "",
  "main": "index.js",
  "bin": {
--- a/packages/renderer/package-lock.json
+++ b/packages/renderer/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/renderer",
-  "version": "2.1.0",
+  "version": "2.1.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/renderer",
-  "version": "2.1.0",
+  "version": "2.1.1",
  "description": "The Joplin note renderer, used the mobile and desktop application",
  "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
  "main": "index.js",
@ -24,7 +24,7 @@
    "typescript": "^4.0.5"
  },
  "dependencies": {
-    "@joplin/fork-htmlparser2": "^4.1.27",
+    "@joplin/fork-htmlparser2": "^4.1.28",
    "font-awesome-filetypes": "^2.1.0",
    "fs-extra": "^8.1.0",
    "highlight.js": "^10.2.1",
--- a/packages/tools/package-lock.json
+++ b/packages/tools/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/tools",
-  "version": "2.0.3",
+  "version": "2.1.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/tools",
-  "version": "2.1.0",
+  "version": "2.1.1",
  "description": "Various tools for Joplin",
  "main": "index.js",
  "author": "Laurent Cozic",
--- a/packages/turndown-plugin-gfm/package-lock.json
+++ b/packages/turndown-plugin-gfm/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/turndown-plugin-gfm",
-  "version": "1.0.31",
+  "version": "1.0.32",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/turndown-plugin-gfm/package.json
+++ b/packages/turndown-plugin-gfm/package.json
@ -4,7 +4,7 @@
  "publishConfig": {
    "access": "public"
  },
-  "version": "1.0.31",
+  "version": "1.0.32",
  "author": "Dom Christie",
  "main": "lib/turndown-plugin-gfm.cjs.js",
  "module": "lib/turndown-plugin-gfm.es.js",
--- a/packages/turndown/package-lock.json
+++ b/packages/turndown/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@joplin/turndown",
-  "version": "4.0.49",
+  "version": "4.0.50",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/turndown/package.json
+++ b/packages/turndown/package.json
@ -1,7 +1,7 @@
 {
  "name": "@joplin/turndown",
  "description": "A library that converts HTML to Markdown",
-  "version": "4.0.49",
+  "version": "4.0.50",
  "author": "Dom Christie",
  "main": "lib/turndown.cjs.js",
  "module": "lib/turndown.es.js",
--- a/readme/changelog_android.md
+++ b/readme/changelog_android.md
@ -1,5 +1,13 @@
 # Joplin Android app changelog

+## [android-v2.1.3](https://github.com/laurent22/joplin/releases/tag/android-v2.1.3) - 2021-06-27T13:34:12Z
+
+- New: Add support for X-API-MIN-VERSION header (51f3c00)
+- Improved: Activate Joplin Server optimisations (3d03321)
+- Improved: Also allow disabling TLS errors for Joplin Cloud to go around error UNABLE_TO_GET_ISSUER_CERT_LOCALLY (118a2f9)
+- Fixed: Fixed search when the index contains non-existing notes (5ecac21)
+- Fixed: Fixed version number on config screen (65e9268)
+
 ## [android-v2.1.2](https://github.com/laurent22/joplin/releases/tag/android-v2.1.2) (Pre-release) - 2021-06-20T18:36:23Z

 - Fixed: Fixed error that could prevent a revision from being created, and that would prevent the revision service from processing the rest of the notes (#5051)
--- a/readme/changelog_cli.md
+++ b/readme/changelog_cli.md
@ -1,5 +1,20 @@
 # Joplin terminal app changelog

+## [cli-v2.1.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.1.1) - 2021-06-27T14:08:02Z
+
+- New: Add support for X-API-MIN-VERSION header (51f3c00)
+- New: Added flag to disable local lock when synchronising (7aff6d2)
+- Improved: Allow uploading items in batch when synchronising with Joplin Server (0222c0f)
+- Improved: Also allow disabling TLS errors for Joplin Cloud to go around error UNABLE_TO_GET_ISSUER_CERT_LOCALLY (118a2f9)
+- Improved: Improved first sync speed when synchronising with Joplin Server (4dc1210)
+- Improved: Mask auth token and password in log (0d33955)
+- Improved: Optimise first synchronisation, when items have never been synced before (15ce5cd)
+- Improved: Update Mermaid: 8.8.4 -&gt; 8.10.2 (#5092 by Helmut K. C. Tessarek)
+- Fixed: Fixed error that could prevent a revision from being created, and that would prevent the revision service from processing the rest of the notes (#5051)
+- Fixed: Fixed issue when trying to sync an item associated with a share that no longer exists (5bb68ba)
+- Fixed: Fixed search when the index contains non-existing notes (5ecac21)
+- Fixed: Handle special type of code block when importing ENEX files (#4965)
+
 ## [cli-v2.0.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.0.1) - 2021-06-16T19:06:28Z

 - New: Add new date format YYMMDD (#4954 by Helmut K. C. Tessarek)