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

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.0.166",
+  "version": "1.0.167",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

CliClient/package.json

@@ -28,7 +28,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.166",
+  "version": "1.0.167",
   "bin": {
     "joplin": "./main.js"
   },

ElectronClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.0.240",
+  "version": "1.0.241",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

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": {

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}`);

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))