From f07636e4b73ed62ae05db568f5ad72936a7b08c1 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Thu, 12 Aug 2021 19:27:57 +0100 Subject: [PATCH 1/8] Desktop release v2.3.3 --- packages/app-desktop/package-lock.json | 4 ++-- packages/app-desktop/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app-desktop/package-lock.json b/packages/app-desktop/package-lock.json index b21690ef80..f8d0dc70d9 100644 --- a/packages/app-desktop/package-lock.json +++ b/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", diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json index 4e8e9c9ed2..2bc95dd855 100644 --- a/packages/app-desktop/package.json +++ b/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, From f0ad813f40f659eb77416e12b83109d7aef0ff1b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Thu, 12 Aug 2021 21:26:29 +0100 Subject: [PATCH 2/8] Tools: remove git pull from Android release script, which can make upload fail --- packages/app-mobile/android/app/build.gradle | 4 ++-- packages/tools/release-android.ts | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index 5987c4a806..a1f9e26ee3 100644 --- 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 2097644 - versionName "2.3.0" + versionCode 2097645 + versionName "2.3.1" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/packages/tools/release-android.ts b/packages/tools/release-android.ts index ec5df7b511..0126d7790c 100644 --- a/packages/tools/release-android.ts +++ b/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() From d0251400a4531c2325c14c9a74bb77536bbd83b5 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Thu, 12 Aug 2021 21:32:54 +0100 Subject: [PATCH 3/8] version --- packages/app-mobile/android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index a1f9e26ee3..a86f1d317e 100644 --- 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 2097645 - versionName "2.3.1" + versionCode 2097646 + versionName "2.3.2" ndk { abiFilters "armeabi-v7a", "x86" } From 6ce19ed6801552efcbcf17bd9834a625f17ec9e8 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Thu, 12 Aug 2021 21:57:37 +0100 Subject: [PATCH 4/8] Android 2.3.3 --- packages/app-mobile/android/app/build.gradle | 4 ++-- readme/changelog_android.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index a86f1d317e..95152ca0c4 100644 --- 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 2097646 - versionName "2.3.2" + versionCode 2097647 + versionName "2.3.3" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/readme/changelog_android.md b/readme/changelog_android.md index cdb3c652da..dcbf156094 100644 --- a/readme/changelog_android.md +++ b/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. From c96ec36d0d52fde686003f98f3a84db5d6d75df0 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 13 Aug 2021 10:15:38 +0100 Subject: [PATCH 5/8] Server v2.3.3 --- packages/server/package-lock.json | 4 ++-- packages/server/package.json | 2 +- readme/changelog_server.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json index 95695d86d6..6b317f0213 100644 --- a/packages/server/package-lock.json +++ b/packages/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@joplin/server", - "version": "2.3.2", + "version": "2.3.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@joplin/server", - "version": "2.3.2", + "version": "2.3.3", "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", "@koa/cors": "^3.1.0", diff --git a/packages/server/package.json b/packages/server/package.json index 5342461603..c687d6fa62 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/server", - "version": "2.3.2", + "version": "2.3.3", "private": true, "scripts": { "start-dev": "nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev", diff --git a/readme/changelog_server.md b/readme/changelog_server.md index a918c1bc84..700c933164 100644 --- a/readme/changelog_server.md +++ b/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.3-beta](https://github.com/laurent22/joplin/releases/tag/server-v2.3.3-beta) (Pre-release) - 2021-08-13T09:14:40Z - Improved: Allow setting email key to prevent the same email to be sent multiple times (391204c) - Improved: Clarify beta transition message (c4fcfec) From feda5afe44ea1c8c49539a83e0a3e5b1ce5a3f96 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 13 Aug 2021 17:55:50 +0100 Subject: [PATCH 6/8] Tools: Fixed server Dockerfile for Node 16 --- Dockerfile.server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.server b/Dockerfile.server index f87cce4355..5b176e19d8 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -1,6 +1,6 @@ # https://versatile.nl/blog/deploying-lerna-web-apps-with-docker -FROM node:12 +FROM node:16 RUN apt-get update RUN apt-get --yes install vim From 1478c368c5837b0c26b4bea96bbba80f6cabce83 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 13 Aug 2021 17:57:06 +0100 Subject: [PATCH 7/8] Server v2.3.4 --- packages/server/package-lock.json | 4 ++-- packages/server/package.json | 2 +- readme/changelog_server.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json index 6b317f0213..8b83d93331 100644 --- a/packages/server/package-lock.json +++ b/packages/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@joplin/server", - "version": "2.3.3", + "version": "2.3.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@joplin/server", - "version": "2.3.3", + "version": "2.3.4", "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", "@koa/cors": "^3.1.0", diff --git a/packages/server/package.json b/packages/server/package.json index c687d6fa62..1c64c6023b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/server", - "version": "2.3.3", + "version": "2.3.4", "private": true, "scripts": { "start-dev": "nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev", diff --git a/readme/changelog_server.md b/readme/changelog_server.md index 700c933164..57d6a4880b 100644 --- a/readme/changelog_server.md +++ b/readme/changelog_server.md @@ -1,6 +1,6 @@ # Joplin Server Changelog -## [server-v2.3.3-beta](https://github.com/laurent22/joplin/releases/tag/server-v2.3.3-beta) (Pre-release) - 2021-08-13T09:14:40Z +## [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) From 48f23f1ee72102ea6327ea9a26f8bf1192d5d7d6 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 13 Aug 2021 17:58:03 +0100 Subject: [PATCH 8/8] Tools: Build renderer assets --- .../highlight.js/atom-one-dark-reasonable.css | 9 +++++---- .../assets/highlight.js/atom-one-light.css | 16 +++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/packages/renderer/assets/highlight.js/atom-one-dark-reasonable.css b/packages/renderer/assets/highlight.js/atom-one-dark-reasonable.css index a38738d96e..0a43fe26b9 100644 --- a/packages/renderer/assets/highlight.js/atom-one-dark-reasonable.css +++ b/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 { diff --git a/packages/renderer/assets/highlight.js/atom-one-light.css b/packages/renderer/assets/highlight.js/atom-one-light.css index 4ae2c63f84..d5bd1d2a9a 100644 --- a/packages/renderer/assets/highlight.js/atom-one-light.css +++ b/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; }