From 199c411a7d4c9e0b371219f669ca2b6920b35350 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 4 Sep 2020 18:17:24 +0100 Subject: [PATCH 1/3] CLI v1.0.167 --- CliClient/package-lock.json | 2 +- CliClient/package.json | 2 +- readme/changelog_cli.md | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json index 21a1946352..d6f44bbad8 100644 --- a/CliClient/package-lock.json +++ b/CliClient/package-lock.json @@ -1,6 +1,6 @@ { "name": "joplin", - "version": "1.0.166", + "version": "1.0.167", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/CliClient/package.json b/CliClient/package.json index dbe9f9e71b..68a34feaa9 100644 --- a/CliClient/package.json +++ b/CliClient/package.json @@ -28,7 +28,7 @@ ], "owner": "Laurent Cozic" }, - "version": "1.0.166", + "version": "1.0.167", "bin": { "joplin": "./main.js" }, diff --git a/readme/changelog_cli.md b/readme/changelog_cli.md index 78ece59364..8a7156c41c 100644 --- a/readme/changelog_cli.md +++ b/readme/changelog_cli.md @@ -1,5 +1,14 @@ # Joplin terminal app changelog +## [cli-v1.0.167](https://github.com/laurent22/joplin/releases/tag/cli-v1.0.167) - 2020-09-04T17:15:49Z + +- New: Add mechanism to lock and upgrade sync targets (#3524) +- Improved: Add search filters (#3213) (#1877 by Naveen M V) +- Improved: Add support for OneDrive for Business (#3433) (#1266 by [@jonath92](https://github.com/jonath92)) +- Improved: Added link navigation shortcuts (#3275) (#3217 by j-krl) +- Improved: When searching, weight notes using Okapi BM25 score (#3454 by Naveen M V) +- Fixed: Fixed sync fetching issue (#3599) (#3591 by [@alexchee](https://github.com/alexchee)) + ## [cli-v1.0.166](https://github.com/laurent22/joplin/releases/tag/cli-v1.0.166) - 2020-08-02T14:03:26Z - New: Add support for AWS S3 synchronisation (Beta) (#2815 by [@alexchee](https://github.com/alexchee)) From a67aedba3553d2c35e97cfcc5c7afa4594009934 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 4 Sep 2020 18:24:53 +0100 Subject: [PATCH 2/3] Tools: Fixed changelog script --- Tools/git-changelog.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tools/git-changelog.js b/Tools/git-changelog.js index 6c0831211c..7832006cc1 100644 --- a/Tools/git-changelog.js +++ b/Tools/git-changelog.js @@ -248,7 +248,9 @@ function capitalizeFirstLetter(string) { function decreaseTagVersion(tag) { const s = tag.split('.'); - let num = Number(s.pop()); + const lastToken = s.pop(); + const s2 = lastToken.split('-'); + let num = Number(s2[0]); num--; if (num < 0) throw new Error(`Cannot decrease tag version: ${tag}`); s.push(`${num}`); From 179e3f9aee660ef0f4e087cc7b237208e19bd31b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 4 Sep 2020 18:25:04 +0100 Subject: [PATCH 3/3] Electron release v1.0.241 --- ElectronClient/package-lock.json | 2 +- ElectronClient/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElectronClient/package-lock.json b/ElectronClient/package-lock.json index bcea71a63a..2a0e6416db 100644 --- a/ElectronClient/package-lock.json +++ b/ElectronClient/package-lock.json @@ -1,6 +1,6 @@ { "name": "Joplin", - "version": "1.0.240", + "version": "1.0.241", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/ElectronClient/package.json b/ElectronClient/package.json index fbb62740f4..2bdd075865 100644 --- a/ElectronClient/package.json +++ b/ElectronClient/package.json @@ -1,6 +1,6 @@ { "name": "Joplin", - "version": "1.0.240", + "version": "1.0.241", "description": "Joplin for Desktop", "main": "main.js", "scripts": {