self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-03-11 14:09:55 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Laurent Cozic 2020-09-04 18:31:01 +01:00
commit a627884876
6 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CliClient/package-lock.json generated
View File

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

2
CliClient/package.json
View File

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

2
ElectronClient/package-lock.json generated
View File

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

2
ElectronClient/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Joplin", "name": "Joplin",
"version": "1.0.240", "version": "1.0.241",
"description": "Joplin for Desktop", "description": "Joplin for Desktop",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

4
Tools/git-changelog.js
View File

@ -248,7 +248,9 @@ function capitalizeFirstLetter(string) {
function decreaseTagVersion(tag) { function decreaseTagVersion(tag) {
const s = tag.split('.'); const s = tag.split('.');
let num = Number(s.pop()); const lastToken = s.pop();
const s2 = lastToken.split('-');
let num = Number(s2[0]);
num--; num--;
if (num < 0) throw new Error(`Cannot decrease tag version: ${tag}`); if (num < 0) throw new Error(`Cannot decrease tag version: ${tag}`);
s.push(`${num}`); s.push(`${num}`);

9
readme/changelog_cli.md
View File

@ -1,5 +1,14 @@
# Joplin terminal app changelog # 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 ## [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)) - New: Add support for AWS S3 synchronisation (Beta) (#2815 by [@alexchee](https://github.com/alexchee))