Merge branch 'dev' of github.com:laurent22/joplin into dev

packages/app-desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "@joplin/app-desktop",
-	"version": "2.3.2",
+	"version": "2.3.3",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@joplin/app-desktop",
-			"version": "2.3.2",
+			"version": "2.3.3",
 			"license": "MIT",
 			"dependencies": {
 				"@fortawesome/fontawesome-free": "^5.13.0",

packages/app-desktop/package.json

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

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 2097644
-		versionName "2.3.0"
+		versionCode 2097647
+		versionName "2.3.3"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}

packages/renderer/assets/highlight.js/atom-one-dark-reasonable.css

@@ -6,6 +6,9 @@ Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
 
 */
 .hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
   color: #abb2bf;
   background: #282c34;
 }
@@ -49,12 +52,10 @@ Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
 .hljs-literal {
   color: #56b6c2;
 }
-.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta .hljs-string {
+.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta-string {
   color: #98c379;
 }
-.hljs-built_in,
-.hljs-title.class_,
-.hljs-class .hljs-title {
+.hljs-built_in, .hljs-class .hljs-title {
   color: #e6c07b;
 }
 .hljs-attr, .hljs-variable, .hljs-template-variable, .hljs-type, .hljs-selector-class, .hljs-selector-attr, .hljs-selector-pseudo, .hljs-number {

packages/renderer/assets/highlight.js/atom-one-light.css

@@ -19,6 +19,9 @@ hue-6-2: #c18401
 */
 
 .hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
   color: #383a42;
   background: #fafafa;
 }
@@ -51,10 +54,15 @@ hue-6-2: #c18401
 .hljs-regexp,
 .hljs-addition,
 .hljs-attribute,
-.hljs-meta .hljs-string {
+.hljs-meta-string {
   color: #50a14f;
 }
 
+.hljs-built_in,
+.hljs-class .hljs-title {
+  color: #c18401;
+}
+
 .hljs-attr,
 .hljs-variable,
 .hljs-template-variable,
@@ -75,12 +83,6 @@ hue-6-2: #c18401
   color: #4078f2;
 }
 
-.hljs-built_in,
-.hljs-title.class_,
-.hljs-class .hljs-title {
-  color: #c18401;
-}
-
 .hljs-emphasis {
   font-style: italic;
 }

packages/server/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "@joplin/server",
-	"version": "2.3.2",
+	"version": "2.3.4",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@joplin/server",
-			"version": "2.3.2",
+			"version": "2.3.4",
 			"dependencies": {
 				"@fortawesome/fontawesome-free": "^5.15.1",
 				"@koa/cors": "^3.1.0",

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "private": true,
   "scripts": {
     "start-dev": "nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev",

packages/tools/release-android.ts

@@ -173,8 +173,6 @@ async function main() {
 		await fs.writeFile(`${rootDir}/README.md`, readmeContent);
 	}
 
-	await execCommandVerbose('git', ['pull']);
-
 	// NOT TESTED: These commands should not be necessary anymore since they are
 	// done in completeReleaseWithChangelog()
 

readme/changelog_android.md

@@ -1,5 +1,9 @@
 # Joplin Android app changelog
 
+## [android-v2.3.3](https://github.com/laurent22/joplin/releases/tag/android-v2.3.3) (Pre-release) - 2021-08-12T20:46:15Z
+
+- Improved: Improved E2EE usability by making its state a property of the sync target (#5276)
+
 ## [android-v2.2.5](https://github.com/laurent22/joplin/releases/tag/android-v2.2.5) (Pre-release) - 2021-08-11T10:54:38Z
 
 - Revert "Plugins: Add ability to make dialogs fit the application window (#5219)" as it breaks several plugin webviews.

readme/changelog_server.md

@@ -1,6 +1,6 @@
 # Joplin Server Changelog
 
-## [server-v2.3.2-beta](https://github.com/laurent22/joplin/releases/tag/server-v2.3.2-beta) (Pre-release) - 2021-08-12T16:26:23Z
+## [server-v2.3.4-beta](https://github.com/laurent22/joplin/releases/tag/server-v2.3.4-beta) (Pre-release) - 2021-08-13T16:56:17Z
 
 - Improved: Allow setting email key to prevent the same email to be sent multiple times (391204c)
 - Improved: Clarify beta transition message (c4fcfec)