CLI v1.0.133

Fix CLI build script
Update website
2025-08-27 20:29:45 +02:00 · 2019-05-13 23:55:53 +01:00 · 2019-05-13 23:52:12 +01:00 · 2019-05-13 23:41:31 +01:00 · 2019-05-13 23:23:57 +01:00 · 2019-05-13 23:23:42 +01:00
24 changed files with 564 additions and 193 deletions
--- a/CliClient/package-lock.json
+++ b/CliClient/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "joplin",
-  "version": "1.0.128",
+  "version": "1.0.133",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/CliClient/package.json
+++ b/CliClient/package.json
@@ -20,7 +20,7 @@
    ],
    "owner": "Laurent Cozic"
  },
-  "version": "1.0.128",
+  "version": "1.0.133",
  "bin": {
    "joplin": "./main.js"
  },
--- a/README.md
+++ b/README.md
@@ -20,9 +20,9 @@ Three types of applications are available: for the **desktop** (Windows, macOS a

 Operating System | Download | Alternative
 -----------------|--------|-------------------
-Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/Joplin-Setup-1.0.151.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
-macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/Joplin-1.0.151.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
-Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/Joplin-1.0.151-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash`
+Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-Setup-1.0.152.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
+macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-1.0.152.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
+Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-1.0.152-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash`

 ## Mobile applications

@@ -68,7 +68,8 @@ The Web Clipper is a browser extension that allows you to save web pages and scr

 - About

-	- [Changelog](https://github.com/laurent22/joplin/blob/master/readme/changelog.md)
+	- [Changelog (Desktop App)](https://github.com/laurent22/joplin/blob/master/readme/changelog.md)
+	- [Changelog (CLI App)](https://github.com/laurent22/joplin/blob/master/readme/changelog_cli.md)
 	- [Stats](https://github.com/laurent22/joplin/blob/master/readme/stats.md)
 	- [Donate](https://github.com/laurent22/joplin/blob/master/readme/donate.md)
 <!-- TOC -->
--- a/Tools/build-website.js
+++ b/Tools/build-website.js
@@ -353,6 +353,10 @@ function markdownToHtml(md) {

 			output = output.toLowerCase();

+			while (output.length && output[output.length - 1] === '-') {
+				output = output.substr(0, output.length - 1);
+			}
+
 			let temp = output;
 			let index = 1;
 			while (doneNames.indexOf(temp) >= 0) {
@@ -482,7 +486,8 @@ async function main() {

 	renderMdToHtml(makeHomePageMd(), rootDir + '/docs/index.html', {});

-	renderFileToHtml(rootDir + '/readme/changelog.md', rootDir + '/docs/changelog/index.html', { title: 'Changelog' });
+	renderFileToHtml(rootDir + '/readme/changelog.md', rootDir + '/docs/changelog/index.html', { title: 'Changelog (Desktop App)' });
+	renderFileToHtml(rootDir + '/readme/changelog_cli.md', rootDir + '/docs/changelog_cli/index.html', { title: 'Changelog (CLI App)' });
 	renderFileToHtml(rootDir + '/readme/clipper.md', rootDir + '/docs/clipper/index.html', { title: 'Web Clipper' });
 	renderFileToHtml(rootDir + '/readme/debugging.md', rootDir + '/docs/debugging/index.html', { title: 'Debugging' });
 	renderFileToHtml(rootDir + '/readme/desktop.md', rootDir + '/docs/desktop/index.html', { title: 'Desktop Application' });
--- a/Tools/release-cli.js
+++ b/Tools/release-cli.js
@@ -5,9 +5,10 @@ const moment = require('moment');

 const rootDir = path.dirname(__dirname);
 const appDir = rootDir + '/CliClient';
+const changelogPath = rootDir + '/readme/changelog_cli.md';

 async function insertChangelog(tag, changelog) {
-	const currentText = await fs.readFile(rootDir + '/readme/changelog_cli.md', 'UTF-8');
+	const currentText = await fs.readFile(changelogPath, 'UTF-8');
 	const lines = currentText.split('\n');

 	const beforeLines = [];
@@ -29,8 +30,7 @@ async function insertChangelog(tag, changelog) {

 	const header = [
 		'##',
-		'[' + tag + ']',
-		'(https://github.com/laurent22/joplin/releases/tag/' + tag + ')',
+		'[' + tag + '](https://github.com/laurent22/joplin/releases/tag/' + tag + ')',
 		'-',
 		moment.utc().format('YYYY-MM-DD\THH:mm:ss') + 'Z',
 	];
@@ -43,11 +43,7 @@ async function insertChangelog(tag, changelog) {

 	const output = beforeLines.concat(newLines).concat(afterLines);

-	console.info(header);
-
-	// console.info(beforeLines);
-	// console.info("****************************");
-	// console.info(afterLines);
+	return output.join('\n');
 }

 // Start with node Tools/release-cli.js --changelog-from cli-v1.0.126
@@ -55,78 +51,59 @@ async function insertChangelog(tag, changelog) {
 async function main() {
 	const argv = require('yargs').argv;

-	// SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-	// ROOT_DIR="$SCRIPT_DIR/.."
-
-	// # LAST_VERSION=$(cat package.json | jq -r .version)
-
-	// cd "$SCRIPT_DIR"
-	// npm version patch
-	// touch "$SCRIPT_DIR/app/main.js"
-	// bash $SCRIPT_DIR/build.sh
-	// cp "$SCRIPT_DIR/package.json" build/
-	// cp "$SCRIPT_DIR/../README.md" build/
-	// cd "$SCRIPT_DIR/build"
-	// npm publish
-
-
-	// git add -A
-	// git commit -m "CLI v$NEW_VERSION"
-	// git tag "cli-v$NEW_VERSION"
-	// git push && git push --tags
-
 	process.chdir(appDir);

 	const packageJson = await fs.readFile('package.json', 'UTF-8'); 
 	const packageConf = JSON.parse(packageJson);

-	const previousVersion = packageConf.version;
-	let changelogFrom = 'cli-v' + previousVersion;
+	const previousVersion = 'v' + packageConf.version;
+	let changelogFrom = 'cli-' + previousVersion;

 	if (argv.changelogFrom) changelogFrom = argv.changelogFrom;

 	const newVersion = await execCommand('npm version patch');
-	console.info('Building ' + newVersion);
-	const newTag = 'cli-v' + newVersion;
+	console.info('Building ' + newVersion + '...');
+	const newTag = 'cli-' + newVersion;
 	
 	await execCommand('touch app/main.js');
 	await execCommand('bash build.sh');
 	await execCommand('cp package.json build/');
 	await execCommand('cp ../README.md build/');
+	
+	process.chdir(appDir + '/build');

-	const changelog = await execCommand('node ../Tools/git-changelog ' + changelogFrom);
+	await execCommand('npm publish');

-	await insertChangelog(newTag, changelog);
+	const changelog = await execCommand('node ' + rootDir + '/Tools/git-changelog ' + changelogFrom);

+	const newChangelog = await insertChangelog(newTag, changelog);

-	// const argv = require('yargs').argv;
+	await fs.writeFile(changelogPath, newChangelog);

-	// const oauthToken = await githubOauthToken();
-	// process.chdir(appDir);
+	const defaultEditor = await execCommand('echo $EDITOR');

-	// console.info('Running from: ' + process.cwd());
+	const finalCmds = [
+		'git add -A',
+		'git commit -m "CLI ' + newVersion + '"',
+		'git tag "cli-' + newVersion + '"',
+		'git push',
+		'git push --tags',
+	];

-	// const version = (await execCommand('npm version patch')).trim();
-	// const tagName = version;
-
-	// console.info('New version number: ' + version);
-
-	// console.info(await execCommand('git add -A'));
-	// console.info(await execCommand('git commit -m "Electron release ' + version + '"'));
-	// console.info(await execCommand('git tag ' + tagName));
-	// console.info(await execCommand('git push && git push --tags'));
-
-	// const releaseOptions = { isDraft: true, isPreRelease: !!argv.beta };
-
-	// console.info('Release options: ', releaseOptions);
-
-	// const release = await githubRelease('joplin', tagName, releaseOptions);
-
-	// console.info('Created GitHub release: ' + release.html_url);
+	console.info('');
+	console.info('Verify that the changelog is correct:');
+	console.info('');
+	console.info(defaultEditor + ' "' + changelogPath + '"');
+	console.info('');
+	console.info('Then run these commands:');
+	console.info('');
+	console.info(finalCmds.join(' && '));
 }

 main().catch((error) => {
 	console.error('Fatal error');
 	console.error(error);
+	console.error('');
+	console.error('If the app cannot auto-detect the previous tag name, specify it using --changelog-from TAG_NAME');
 	process.exit(1);
 });
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-	<title>Changelog | Joplin</title>
+	<title>Changelog (Desktop App) | Joplin</title>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
@@ -269,6 +270,18 @@
 </ul>
 </div>
 <h1><a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a>Joplin changelog</h1>
+<h2><a name="v1-0-152-https-github-com-laurent22-joplin-releases-tag-v1-0-152-2019-05-13t09-08-07z" href="#v1-0-152-https-github-com-laurent22-joplin-releases-tag-v1-0-152-2019-05-13t09-08-07z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.152">v1.0.152</a> - 2019-05-13T09:08:07Z</h2>
+<p>Same as v1.0.151 but with a fix to the migration issue, that was in turns affecting synchronisation.</p>
+<ul>
+<li>New: Support for note history (<a href="https://github.com/laurent22/joplin/issues/1415">#1415</a>) (<a href="https://github.com/laurent22/joplin/issues/712">#712</a>)</li>
+<li>Improved: Save size of a resource to the database; and added mechanism to run non-database migrations</li>
+<li>Improved: Improved note deletion dialog (<a href="https://github.com/laurent22/joplin/issues/1502">#1502</a>)</li>
+<li>Fixed: Allow resources greater than 10 MB but they won't be synced on mobile (<a href="https://github.com/laurent22/joplin/issues/371">#371</a>)</li>
+<li>Fixed: Improved handling of images when using external editor, so that it works in Atom, VSCode and Typora (<a href="https://github.com/laurent22/joplin/issues/1425">#1425</a>)</li>
+<li>Fixed: Some images were not being displayed</li>
+<li>Fixed: Resets the undo manager when creating new notes (<a href="https://github.com/laurent22/joplin/issues/1495">#1495</a>) (<a href="https://github.com/laurent22/joplin/issues/355">#355</a>)</li>
+<li>Fixed: Prevents notes with no title to break after synchronize (<a href="https://github.com/laurent22/joplin/issues/1472">#1472</a>)</li>
+</ul>
 <h2><a name="v1-0-151-https-github-com-laurent22-joplin-releases-tag-v1-0-151-2019-05-12t15-14-32z" href="#v1-0-151-https-github-com-laurent22-joplin-releases-tag-v1-0-151-2019-05-12t15-14-32z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.151">v1.0.151</a> - 2019-05-12T15:14:32Z</h2>
 <p>Same as v1.0.150 but with a small fix to set the resources file size.</p>
 <ul>
--- a/docs/changelog_cli/index.html
+++ b/docs/changelog_cli/index.html
@@ -0,0 +1,330 @@
+<!doctype html>
+<html>
+<head>
+	<title>Changelog (CLI App) | Joplin</title>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
+	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
+	<style>
+	body {
+		background-color: #F1F1F1;
+		color: #333333;
+	}
+	table {
+		margin-bottom: 1em;
+	}
+	td, th {
+		padding: .8em;
+		border: 1px solid #ccc;
+	}
+	h1, h2 {
+		border-bottom: 1px solid #eaecef;
+		padding-bottom: 0.3em;
+		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+		font-weight: 600;
+		font-size: 2em;
+		margin-bottom: 16px;
+	}
+	h2 {
+		font-size: 1.6em;
+	}
+	h3 {
+		font-size: 1.3em;
+	}
+	code {
+		color: black;
+		background-color: #eee;
+		border: 1px solid #ccc;
+		font-size: .85em;
+	}
+	pre code {
+		border: none;
+	}
+	pre {
+		font-size: .85em;
+	}
+	#toc ul {
+		margin-bottom: 10px;
+	}
+	#toc {
+		padding-bottom: 1em;
+	}
+	.title-icon {
+		height: 2em;
+	}
+	.sub-title {
+		font-weight: bold;
+		font-size: 1.5em;
+	}
+	.container {
+		background-color: white;
+		padding: 0;
+		box-shadow: 0 10px 20px #888888;
+	}
+	table.screenshots {
+		margin-top: 2em;
+		margin-bottom: 2em;
+	}
+	table.screenshots th {
+		height: 3em;
+		text-align: center;
+	}
+	table.screenshots th, 
+	table.screenshots td {
+		border: 1px solid #C2C2C2;
+	}
+	img[align="left"] {
+		margin-right: 10px;
+		margin-bottom: 10px;
+	}
+	.mobile-screenshot {
+		height: 40em;
+		padding: 1em;
+	}
+	.cli-screenshot-wrapper {
+		background-color: black;
+		vertical-align: top;
+		padding: 1em 2em 1em 1em;
+	}
+	.cli-screenshot {
+		font-family: "Monaco", "Inconsolata", "CONSOLAS", "Deja Vu Sans Mono", "Droid Sans Mono", "Andale Mono", monospace;
+		background-color: black;
+		color: white;
+		border: none;
+	}
+	.cli-screenshot .prompt {
+		color: #48C2F0;
+	}
+	.top-screenshot {
+		margin-top: 2em;
+		text-align: center;
+	}
+	.header {
+		position: relative;
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-top: 1em;
+		padding-bottom: 1em;
+		color: white;
+		background-color: #2B2B3D;
+	}
+	.header a h1 {
+		color: white;
+	}
+	.content {
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-bottom: 2em;
+		padding-top: 2em;
+	}
+	.forkme {
+		position: absolute;
+		right: 0;
+		top:0;
+	}
+	.nav-wrapper {
+		position: relative;
+		width: inherit;
+	}
+	.nav {
+		background-color: black;
+		display: table;
+		width: inherit;
+	}
+	.nav.sticky {
+		position:fixed;
+		top: 0;
+		width: inherit;
+		box-shadow: 0 0 10px #000000;
+	}
+	.nav a {
+		color: white;
+		display: inline-block;
+		padding: .6em .9em .6em .9em;
+	}
+	.nav ul {
+		padding-left: 2em;
+		margin-bottom: 0;
+		display: table-cell;
+		min-width: 250px;
+	}
+	.nav ul li {
+		display: inline-block;
+		padding: 0;
+	}
+	.nav li.selected {
+		background-color: #222;
+		font-weight: bold;
+	}
+	.nav-right {
+		display: table-cell;
+		width: 100%;
+		text-align: right;
+		vertical-align: middle;
+		line-height: 0;
+	}
+	.nav-right .share-btn {
+		display: none;
+	}
+	.nav-right .small-share-btn {
+		display: none;
+	}
+	.footer {
+		padding-top: 1em;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 2em;
+		color: gray;
+		font-size: .9em;
+	}
+	a.heading-anchor {
+		display: inline-block;
+		opacity: 0;
+		width: 1.3em;
+		font-size: 0.7em;
+		margin-left: -1.3em;
+		line-height: 1em;
+		text-decoration: none;
+	}
+	a.heading-anchor:hover,
+	h1:hover a.heading-anchor,
+	h2:hover a.heading-anchor,
+	h3:hover a.heading-anchor,
+	h4:hover a.heading-anchor,
+	h5:hover a.heading-anchor,
+	h6:hover a.heading-anchor {
+		opacity: 1;
+	}
+	@media all and (min-width: 400px) {
+		.nav-right .share-btn {
+			display: inline-block;
+		}
+		.nav-right .small-share-btn {
+			display: none;
+		}
+	}
+</style>
+</head>
+
+<body>
+
+<div class="container">
+
+<div class="header">
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</h1></a>
+	<p class="sub-title">An open source note taking and to-do application with synchronisation capabilities.</p>
+</div>
+
+<div class="nav-wrapper">
+	<div class="nav">
+		<ul>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
+			<li><a class="help" href="#" title="Menu">Menu</a></li>
+		</ul>
+		<div class="nav-right">
+			<!--
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+			-->
+			<iframe class="share-btn share-btn-github" src="https://ghbtns.com/github-btn.html?user=laurent22&repo=joplin&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+		</div>
+	</div>
+</div>
+
+<div class="content">
+	<div id="toc"><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="https://joplinapp.org/desktop">Desktop application</a></li>
+<li><a href="https://joplinapp.org/mobile">Mobile applications</a></li>
+<li><a href="https://joplinapp.org/terminal">Terminal application</a></li>
+<li><a href="https://joplinapp.org/clipper">Web Clipper</a></li>
+</ul>
+</li>
+<li>
+<p>Support</p>
+<ul>
+<li><a href="https://discourse.joplin.cozic.net">Joplin Forum</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/stats">Stats</a></li>
+<li><a href="https://joplinapp.org/donate">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1><a name="joplin-terminal-app-changelog" href="#joplin-terminal-app-changelog" class="heading-anchor">🔗</a>Joplin terminal app changelog</h1>
+<h2><a name="cli-v1-0-129-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-129-2019-05-13t22-17-20z" href="#cli-v1-0-129-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-129-2019-05-13t22-17-20z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.129">cli-v1.0.129</a> - 2019-05-13T22:17:20Z</h2>
+<ul>
+<li>New: Added option to disable creation of welcome items</li>
+<li>New: Support for note history (#1415) (#712)</li>
+<li>Improved: Save size of a resource to the database; and added mechanism to run non-database migrations</li>
+<li>Improved: Display better error message when trying to sync with a new sync target from an old version of Joplin</li>
+<li>Improved: Update sharp (for node 12 compatibility) (#1471)</li>
+<li>Fixed: Do not resize images if they are already below the max dimensions</li>
+<li>Fixed: Allow resources greater than 10 MB but they won't be synced on mobile (#371)</li>
+<li>Fixed: Bump sqlite3 to v4.0.7 for node12 support (#1508)</li>
+<li>Fixed: Prevents notes with no title to break after synchronize (#1472)</li>
+<li>Fixed: Import lists and sub-lists from Enex files with correct indentation (#1476)</li>
+</ul>
+<h2><a name="cli-v1-0-125-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-125-2019-04-29t18-38-05z" href="#cli-v1-0-125-https-github-com-laurent22-joplin-releases-tag-cli-v1-0-125-2019-04-29t18-38-05z" class="heading-anchor">🔗</a><a href="https://github.com/laurent22/joplin/releases/tag/cli-v1.0.125">cli-v1.0.125</a> - 2019-04-29T18:38:05Z</h2>
+<ul>
+<li>Improved: Improved support for Japanese, Chinese, Korean search queries (also applies to Goto Anything)</li>
+<li>Improved: Display warning when changing dir for filesystem sync</li>
+<li>Fixed: Remove message &quot;Processing a path that has already been done&quot; as this is not an error (#1353)</li>
+<li>Fixed: Some resources could incorrectly be deleted even though they are still present in a note. Also added additional verifications before deleting a resource. (#1433)</li>
+<li>Fixed: Handle invalid resource tags that contain no data when importing ENEX (#1405)</li>
+<li>Fixed: Restored inline code styling (#1326)</li>
+</ul>
+
+<script>
+	function stickyHeader() { 
+		return; // Disabled
+
+		if ($(window).scrollTop() > 179) {
+			$('.nav').addClass('sticky'); 
+		} else {
+			$('.nav').removeClass('sticky');
+		}
+	}
+
+	$('#toc').hide();
+
+	$('.help').click(function(event) {
+		event.preventDefault();
+		$('#toc').show();
+	});
+
+	$(window).scroll(function() {
+		stickyHeader();
+	});
+
+	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+	ga('create', 'UA-103586105-1', 'auto');
+	ga('send', 'pageview');
+</script>
+
+<div class="footer">
+Copyright (c) 2016-2019 Laurent Cozic
+</div>
+</body>
+</html>
--- a/docs/clipper/index.html
+++ b/docs/clipper/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
--- a/docs/debugging/index.html
+++ b/docs/debugging/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
--- a/docs/desktop/index.html
+++ b/docs/desktop/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
--- a/docs/donate/index.html
+++ b/docs/donate/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
--- a/docs/e2ee/index.html
+++ b/docs/e2ee/index.html
@@ -261,14 +261,15 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
 </li>
 </ul>
 </div>
-<h1><a name="about-end-to-end-encryption-e2ee-" href="#about-end-to-end-encryption-e2ee-" class="heading-anchor">🔗</a>About End-To-End Encryption (E2EE)</h1>
+<h1><a name="about-end-to-end-encryption-e2ee" href="#about-end-to-end-encryption-e2ee" class="heading-anchor">🔗</a>About End-To-End Encryption (E2EE)</h1>
 <p>End-to-end encryption (E2EE) is a system where only the owner of the data (i.e. notes, notebooks, tags or resources) can read it. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data.</p>
 <p>The system is designed to defeat any attempts at surveillance or tampering because no third party can decipher the data being communicated or stored.</p>
 <p>There is a small overhead to using E2EE since data constantly has to be encrypted and decrypted so consider whether you really need the feature.</p>
--- a/docs/faq/index.html
+++ b/docs/faq/index.html
@@ -261,14 +261,15 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
 </li>
 </ul>
 </div>
-<h1><a name="clicking-edit-in-external-editor-does-nothing-i-want-to-change-the-editor-" href="#clicking-edit-in-external-editor-does-nothing-i-want-to-change-the-editor-" class="heading-anchor">🔗</a>Clicking 'Edit in External Editor' does nothing! / I want to change the editor!</h1>
+<h1><a name="how-can-i-edit-my-note-in-an-external-text-editor" href="#how-can-i-edit-my-note-in-an-external-text-editor" class="heading-anchor">🔗</a>How can I edit my note in an external text editor?</h1>
 <p>The editor command (may include arguments) defines which editor will be used to open a note. If none is provided it will try to auto-detect the default editor. If this does nothing or you want to change it for Joplin, you need to configure it in the Preferences -&gt; Text editor command.</p>
 <p>Some example configurations are: (comments after #)</p>
 <p>Linux/Mac:</p>
@@ -289,7 +290,7 @@ notepad++.exe --openSession   # Opens Notepad ++ in new window
 <p>Note that the path to directory with your editor executable must exist in your PATH variable (<a href="https://www.computerhope.com/issues/ch000549.htm">Windows</a>, <a href="https://opensource.com/article/17/6/set-path-linux">Linux/Mac</a>) If not, the full path to the executable must be provided.</p>
 <h1><a name="when-i-open-a-note-in-vim-the-cursor-is-not-visible" href="#when-i-open-a-note-in-vim-the-cursor-is-not-visible" class="heading-anchor">🔗</a>When I open a note in vim, the cursor is not visible</h1>
 <p>It seems to be due to the setting <code>set term=ansi</code> in .vimrc. Removing it should fix the issue. See <a href="https://github.com/laurent22/joplin/issues/147">https://github.com/laurent22/joplin/issues/147</a> for more information.</p>
-<h1><a name="all-my-notes-got-deleted-after-changing-the-webdav-url-" href="#all-my-notes-got-deleted-after-changing-the-webdav-url-" class="heading-anchor">🔗</a>All my notes got deleted after changing the WebDAV URL!</h1>
+<h1><a name="all-my-notes-got-deleted-after-changing-the-webdav-url" href="#all-my-notes-got-deleted-after-changing-the-webdav-url" class="heading-anchor">🔗</a>All my notes got deleted after changing the WebDAV URL!</h1>
 <p>When changing the WebDAV URL, make sure that the new location has the same exact content as the old location (i.e. copy all the Joplin data over to the new location). Otherwise, if there's nothing on the new location, Joplin is going to think that you have deleted all your data and will proceed to delete it locally too. So to change the WebDAV URL, please follow these steps:</p>
 <ol>
 <li>Make a backup of your Joplin data in case something goes wrong. Export to a JEX archive for example.</li>
@@ -300,16 +301,17 @@ notepad++.exe --openSession   # Opens Notepad ++ in new window
 <li>Synchronise to verify that everything is working.</li>
 <li>Do step 5 and 6 for all the other Joplin clients you need to sync.</li>
 </ol>
-<h1><a name="how-can-i-easily-enter-markdown-tags-in-android-" href="#how-can-i-easily-enter-markdown-tags-in-android-" class="heading-anchor">🔗</a>How can I easily enter Markdown tags in Android?</h1>
+<h1><a name="how-can-i-easily-enter-markdown-tags-in-android" href="#how-can-i-easily-enter-markdown-tags-in-android" class="heading-anchor">🔗</a>How can I easily enter Markdown tags in Android?</h1>
 <p>You may use a special keyboard such as <a href="https://play.google.com/store/apps/details?id=kl.ime.oh&amp;hl=en">Multiling O Keyboard</a>, which has shortcuts to create Markdown tags. <a href="https://discourse.joplin.cozic.net/t/android-create-new-list-item-with-enter/585/2?u=laurent">More information in this post</a>.</p>
-<h1><a name="the-initial-sync-is-very-slow-how-can-i-speed-it-up-" href="#the-initial-sync-is-very-slow-how-can-i-speed-it-up-" class="heading-anchor">🔗</a>The initial sync is very slow, how can I speed it up?</h1>
+<h1><a name="the-initial-sync-is-very-slow-how-can-i-speed-it-up" href="#the-initial-sync-is-very-slow-how-can-i-speed-it-up" class="heading-anchor">🔗</a>The initial sync is very slow, how can I speed it up?</h1>
 <p>Whenever importing a large number of notes, for example from Evernote, it may take a very long time for the first sync to complete. There are various techniques to speed thing up (if you don't want to simply wait for the sync to complete), which are outlined in <a href="https://discourse.joplin.cozic.net/t/workaround-for-slow-initial-bulk-sync-after-evernote-import/746?u=laurent">this post</a>.</p>
-<h1><a name="is-it-possible-to-use-real-file-and-folder-names-in-the-sync-target-" href="#is-it-possible-to-use-real-file-and-folder-names-in-the-sync-target-" class="heading-anchor">🔗</a>Is it possible to use real file and folder names in the sync target?</h1>
+<h1><a name="is-it-possible-to-use-real-file-and-folder-names-in-the-sync-target" href="#is-it-possible-to-use-real-file-and-folder-names-in-the-sync-target" class="heading-anchor">🔗</a>Is it possible to use real file and folder names in the sync target?</h1>
 <p>Unfortunately it is not possible. Joplin synchronises with file systems using an open format however it does not mean the sync files are meant to be user-editable. The format is designed to be performant and reliable, not user friendly (it cannot be both), and that cannot be changed. Joplin sync directory is basically just a database.</p>
-<h1><a name="could-there-be-a-pin-or-password-to-restrict-access-to-joplin-" href="#could-there-be-a-pin-or-password-to-restrict-access-to-joplin-" class="heading-anchor">🔗</a>Could there be a PIN or password to restrict access to Joplin?</h1>
-<p>Short answer: no. The end to end encryption that Joplin implements is to protect the data during transmission and on the cloud service so that only you can access it.</p>
+<h1><a name="could-there-be-a-password-to-restrict-access-to-joplin" href="#could-there-be-a-password-to-restrict-access-to-joplin" class="heading-anchor">🔗</a>Could there be a password to restrict access to Joplin?</h1>
+<p>The end to end encryption that Joplin implements is to protect the data during transmission and on the cloud service so that only you can access it.</p>
 <p>On the local device it is assumed that the data is safe due to the OS built-in security features. If additional security is needed it's always possible to put the notes on an encrypted Truecrypt drive for instance.</p>
-<p>If someone that you don't trust has access to the computer, they can put a keylogger anyway so any local encryption or PIN access would not be useful.</p>
+<p>For these reasons, because the OS or yourself can easily protect the local data, no PIN or password is currently supported to access Joplin.</p>
+<p>There is however an issue open about it, so pull requests are welcome: <a href="https://github.com/laurent22/joplin/issues/289">https://github.com/laurent22/joplin/issues/289</a></p>
 <h1><a name="webdav-synchronisation-is-not-working" href="#webdav-synchronisation-is-not-working" class="heading-anchor">🔗</a>WebDAV synchronisation is not working</h1>
 <h2><a name="forbidden-error-in-strato" href="#forbidden-error-in-strato" class="heading-anchor">🔗</a>&quot;Forbidden&quot; error in Strato</h2>
 <p>For example:</p>
@@ -329,12 +331,10 @@ on this server.&lt;/p&gt;
 <li>Check the WebDAV URL - to get the correct URL, go to Nextcloud and, in the left sidebar, click on &quot;Settings&quot; and copy the WebDAV URL from there. <strong>Do not forget to add the folder you've created to that URL</strong>. For example, if the base the WebDAV URL is &quot;<a href="https://example.com/nextcloud/remote.php/webdav/">https://example.com/nextcloud/remote.php/webdav/</a>&quot; and you want the notes to be synced in the &quot;Joplin&quot; directory, you need to give the URL &quot;<a href="https://example.com/nextcloud/remote.php/webdav/Joplin">https://example.com/nextcloud/remote.php/webdav/Joplin</a>&quot; <strong>and you need to create the &quot;Joplin&quot; directory yourself</strong>.</li>
 <li>Did you enable <strong>2FA</strong> (Multi-factor authentication) on Nextcloud? In that case, you need to <a href="https://github.com/laurent22/joplin/issues/1453#issuecomment-486640902">create a one-time password for Joplin on the Nextcloud admin interface</a>.</li>
 </ul>
-<h1><a name="could-you-publish-joplin-on-f-droid-" href="#could-you-publish-joplin-on-f-droid-" class="heading-anchor">🔗</a>Could you publish Joplin on F-droid?</h1>
-<p>Joplin relies on Firebase to enable reliable notifications on Android. Since F-Droid <a href="https://gitlab.com/fdroid/rfp/issues/434#note_55239154">do not accept applications that depend on this package</a>, it is not currently possible to have Joplin in that repository. To avoid using Google Play, you have the option to directly download the Joplin APK file.</p>
-<h1><a name="why-is-it-named-joplin-" href="#why-is-it-named-joplin-" class="heading-anchor">🔗</a>Why is it named Joplin?</h1>
-<p>The name comes from the composer and pianist <a href="https://en.wikipedia.org/wiki/Scott_Joplin">Scott Joplin</a>, which I often listen to. His name is also easy to remember and type so it fell like a good choice. And, to quote a user on Hacker News, &quot;though Scott Joplin's ragtime musical style has a lot in common with some very informal music, his own approach was more educated, sophisticated, and precise. Every note was in its place for a reason, and he was known to prefer his pieces to be performed exactly as written. So you could say that compared to the people who came before him, his notes were more organized&quot;.</p>
-<h1><a name="how-can-i-use-self-signed-ssl-certificates-on-android-" href="#how-can-i-use-self-signed-ssl-certificates-on-android-" class="heading-anchor">🔗</a>How can I use self-signed SSL certificates on Android?</h1>
+<h1><a name="how-can-i-use-self-signed-ssl-certificates-on-android" href="#how-can-i-use-self-signed-ssl-certificates-on-android" class="heading-anchor">🔗</a>How can I use self-signed SSL certificates on Android?</h1>
 <p>If you want to serve using https but can't or don't want to use SSL certificates signed by trusted certificate authorities (like &quot;Let's Encrypt&quot;), it's possible to generate a custom CA and sign your certificates with it. You can generate the CA and certificates using <a href="https://gist.github.com/fntlnz/cf14feb5a46b2eda428e000157447309">openssl</a>, but I like to use a tool called <a href="https://github.com/FiloSottile/mkcert">mkcert</a> for it's simplicity. Finally, you have to add your CA certificate to Android settings so that Android can recognize the certificates you signed with your CA as valid (<a href="https://support.google.com/nexus/answer/2844832?hl=en-GB">link</a>).</p>
+<h1><a name="why-is-it-named-joplin" href="#why-is-it-named-joplin" class="heading-anchor">🔗</a>Why is it named Joplin?</h1>
+<p>The name comes from the composer and pianist <a href="https://en.wikipedia.org/wiki/Scott_Joplin">Scott Joplin</a>, which I often listen to. His name is also easy to remember and type so it fell like a good choice. And, to quote a user on Hacker News, &quot;though Scott Joplin's ragtime musical style has a lot in common with some very informal music, his own approach was more educated, sophisticated, and precise. Every note was in its place for a reason, and he was known to prefer his pieces to be performed exactly as written. So you could say that compared to the people who came before him, his notes were more organized&quot;.</p>

 <script>
 	function stickyHeader() { 
--- a/docs/index.html
+++ b/docs/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
@@ -288,17 +289,17 @@
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/Joplin-Setup-1.0.151.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
-<td>Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/JoplinPortable.exe'>Portable version</a><br><br>The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-Setup-1.0.152.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
+<td>Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/JoplinPortable.exe'>Portable version</a><br><br>The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</td>
 </tr>
 <tr>
 <td>macOS</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/Joplin-1.0.151.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-1.0.152.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
 <td>You can also use Homebrew: <code>brew cask install joplin</code></td>
 </tr>
 <tr>
 <td>Linux</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.151/Joplin-1.0.151-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-1.0.152-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
 <td>An Arch Linux package <a href="#terminal-application">is also available</a>.<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> <code>wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash</code></td>
 </tr>
 </tbody>
@@ -316,7 +317,7 @@
 <tr>
 <td>Android</td>
 <td><a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a></td>
-<td>or <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.251/joplin-v1.0.251.apk">Download APK File</a></td>
+<td>or <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.252/joplin-v1.0.252.apk">Download APK File</a></td>
 </tr>
 <tr>
 <td>iOS</td>
@@ -661,49 +662,49 @@ $$
 <td>Arabic</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ar.po">ar</a></td>
 <td>عبد الناصر سعيد (<a href="mailto:as@althobaity.com">as@althobaity.com</a>)</td>
-<td>95%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/basque_country.png" alt=""></td>
 <td>Basque</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po">eu</a></td>
 <td>juan.abasolo@ehu.eus</td>
-<td>54%</td>
+<td>53%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/catalonia.png" alt=""></td>
 <td>Catalan</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po">ca</a></td>
 <td>jmontane, 2018</td>
-<td>78%</td>
+<td>75%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hr.png" alt=""></td>
 <td>Croatian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po">hr_HR</a></td>
 <td>Hrvoje Mandić (<a href="mailto:trbuhom@net.hr">trbuhom@net.hr</a>)</td>
-<td>44%</td>
+<td>43%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cz.png" alt=""></td>
 <td>Czech</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po">cs_CZ</a></td>
 <td>Lukas Helebrandt (<a href="mailto:lukas@aiya.cz">lukas@aiya.cz</a>)</td>
-<td>69%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/dk.png" alt=""></td>
 <td>Dansk</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po">da_DK</a></td>
 <td>Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk.</td>
-<td>70%</td>
+<td>68%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/de.png" alt=""></td>
 <td>Deutsch</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po">de_DE</a></td>
 <td>Michael Sonntag (<a href="mailto:ms@editorei.de">ms@editorei.de</a>)</td>
-<td>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gb.png" alt=""></td>
@@ -724,119 +725,119 @@ $$
 <td>Español</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po">es_ES</a></td>
 <td>Andros Fenollosa (andros@fenollosa.email)</td>
-<td>96%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fr.png" alt=""></td>
 <td>Français</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po">fr_FR</a></td>
 <td>Laurent Cozic</td>
-<td>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/galicia.png" alt=""></td>
 <td>Galician</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po">gl_ES</a></td>
 <td>Marcos Lans (<a href="mailto:marcoslansgarza@gmail.com">marcoslansgarza@gmail.com</a>)</td>
-<td>69%</td>
+<td>67%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/it.png" alt=""></td>
 <td>Italiano</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po">it_IT</a></td>
 <td></td>
-<td>86%</td>
+<td>83%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/be.png" alt=""></td>
 <td>Nederlands</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po">nl_BE</a></td>
 <td></td>
-<td>55%</td>
+<td>53%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/nl.png" alt=""></td>
 <td>Nederlands</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po">nl_NL</a></td>
 <td>Heimen Stoffels (<a href="mailto:vistausss@outlook.com">vistausss@outlook.com</a>)</td>
-<td>83%</td>
+<td>81%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/no.png" alt=""></td>
 <td>Norwegian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po">nb_NO</a></td>
 <td>Mats Estensen (<a href="mailto:code@mxe.no">code@mxe.no</a>)</td>
-<td>96%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/br.png" alt=""></td>
 <td>Português (Brasil)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po">pt_BR</a></td>
 <td>Renato Nunes Bastos (<a href="mailto:rnbastos@gmail.com">rnbastos@gmail.com</a>)</td>
-<td>90%</td>
+<td>87%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ro.png" alt=""></td>
 <td>Română</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po">ro</a></td>
 <td></td>
-<td>54%</td>
+<td>53%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/si.png" alt=""></td>
 <td>Slovenian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po">sl_SI</a></td>
 <td></td>
-<td>68%</td>
+<td>66%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/se.png" alt=""></td>
 <td>Svenska</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po">sv</a></td>
 <td>Jonatan Nyberg (<a href="mailto:jonatan@autistici.org">jonatan@autistici.org</a>)</td>
-<td>93%</td>
+<td>90%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tr.png" alt=""></td>
 <td>Türkçe</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/tr_TR.po">tr_TR</a></td>
 <td>Zorbey Doğangüneş (<a href="mailto:zorbeyd@gmail.com">zorbeyd@gmail.com</a>)</td>
-<td>90%</td>
+<td>87%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ru.png" alt=""></td>
 <td>Русский</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po">ru_RU</a></td>
 <td>Artyom Karlov (<a href="mailto:artyom.karlov@gmail.com">artyom.karlov@gmail.com</a>)</td>
-<td>96%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cn.png" alt=""></td>
 <td>中文 (简体)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po">zh_CN</a></td>
 <td></td>
-<td>96%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tw.png" alt=""></td>
 <td>中文 (繁體)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po">zh_TW</a></td>
 <td>penguinsam (<a href="mailto:samliu@gmail.com">samliu@gmail.com</a>)</td>
-<td>83%</td>
+<td>81%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/jp.png" alt=""></td>
 <td>日本語</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po">ja_JP</a></td>
 <td>AWASHIRO Ikuya (<a href="mailto:ikunya@gmail.com">ikunya@gmail.com</a>)</td>
-<td>90%</td>
+<td>87%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/kr.png" alt=""></td>
 <td>한국말</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po">ko</a></td>
 <td></td>
-<td>92%</td>
+<td>89%</td>
 </tr>
 </tbody>
 </table>
--- a/docs/mobile/index.html
+++ b/docs/mobile/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
--- a/docs/prereleases/index.html
+++ b/docs/prereleases/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
--- a/docs/spec/index.html
+++ b/docs/spec/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
@@ -279,15 +280,15 @@
 <tbody>
 <tr>
 <td>Total Windows downloads</td>
-<td>245,069</td>
+<td>248,416</td>
 </tr>
 <tr>
 <td>Total macOs downloads</td>
-<td>107,315</td>
+<td>108,379</td>
 </tr>
 <tr>
 <td>Total Linux downloads</td>
-<td>84,788</td>
+<td>85,974</td>
 </tr>
 <tr>
 <td>Windows %</td>
@@ -295,7 +296,7 @@
 </tr>
 <tr>
 <td>macOS %</td>
-<td>25%</td>
+<td>24%</td>
 </tr>
 <tr>
 <td>Linux %</td>
@@ -316,60 +317,68 @@
 </thead>
 <tbody>
 <tr>
+<td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.152">v1.0.152</a></td>
+<td>2019-05-13T09:08:07Z</td>
+<td>1,320</td>
+<td>491</td>
+<td>225</td>
+<td>2,036</td>
+</tr>
+<tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.151">v1.0.151</a></td>
 <td>2019-05-12T15:14:32Z</td>
-<td>1</td>
-<td>0</td>
-<td>0</td>
-<td>1</td>
+<td>1,856</td>
+<td>498</td>
+<td>943</td>
+<td>3,297</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.150">v1.0.150</a></td>
 <td>2019-05-12T11:27:48Z</td>
-<td>281</td>
-<td>82</td>
-<td>48</td>
-<td>411</td>
+<td>375</td>
+<td>107</td>
+<td>53</td>
+<td>535</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.148">v1.0.148</a></td>
 <td>2019-05-08T19:12:24Z</td>
 <td>108</td>
-<td>32</td>
-<td>72</td>
-<td>212</td>
+<td>33</td>
+<td>73</td>
+<td>214</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.145">v1.0.145</a></td>
 <td>2019-05-03T09:16:53Z</td>
-<td>6,790</td>
-<td>2,771</td>
-<td>1,419</td>
-<td>10,980</td>
+<td>6,823</td>
+<td>2,817</td>
+<td>1,422</td>
+<td>11,062</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.143">v1.0.143</a></td>
 <td>2019-04-22T10:51:38Z</td>
-<td>11,554</td>
+<td>11,587</td>
 <td>3,505</td>
 <td>2,760</td>
-<td>17,819</td>
+<td>17,852</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.142">v1.0.142</a></td>
 <td>2019-04-02T16:44:51Z</td>
 <td>14,472</td>
 <td>4,508</td>
-<td>4,705</td>
-<td>23,685</td>
+<td>4,706</td>
+<td>23,686</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.140">v1.0.140</a></td>
 <td>2019-03-10T20:59:58Z</td>
-<td>13,450</td>
+<td>13,454</td>
 <td>4,110</td>
 <td>2,983</td>
-<td>20,543</td>
+<td>20,547</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.139">v1.0.139</a></td>
@@ -398,18 +407,18 @@
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.135">v1.0.135</a></td>
 <td>2019-02-27T23:36:57Z</td>
-<td>12,140</td>
+<td>12,142</td>
 <td>3,915</td>
 <td>4,044</td>
-<td>20,099</td>
+<td>20,101</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.134">v1.0.134</a></td>
 <td>2019-02-27T10:21:44Z</td>
-<td>1,428</td>
-<td>531</td>
+<td>1,430</td>
+<td>532</td>
 <td>201</td>
-<td>2,160</td>
+<td>2,163</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.132">v1.0.132</a></td>
@@ -504,8 +513,8 @@
 <td>2018-09-30T20:15:09Z</td>
 <td>11,869</td>
 <td>3,134</td>
-<td>3,648</td>
-<td>18,651</td>
+<td>3,649</td>
+<td>18,652</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.110">v1.0.110</a></td>
@@ -608,8 +617,8 @@
 <td>2018-05-26T16:36:39Z</td>
 <td>2,686</td>
 <td>1,200</td>
-<td>1,261</td>
-<td>5,147</td>
+<td>1,262</td>
+<td>5,148</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.95">v1.0.95</a></td>
@@ -662,10 +671,10 @@
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.83">v1.0.83</a></td>
 <td>2018-04-04T19:43:58Z</td>
-<td>4,558</td>
+<td>4,560</td>
 <td>2,434</td>
 <td>2,632</td>
-<td>9,624</td>
+<td>9,626</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.82">v1.0.82</a></td>
@@ -776,8 +785,8 @@
 <td>2018-02-08T18:27:39Z</td>
 <td>963</td>
 <td>605</td>
-<td>944</td>
-<td>2,512</td>
+<td>945</td>
+<td>2,513</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.60">v0.10.60</a></td>
@@ -854,10 +863,10 @@
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.39">v0.10.39</a></td>
 <td>2017-12-11T21:19:44Z</td>
-<td>5,506</td>
-<td>3,996</td>
-<td>2,903</td>
-<td>12,405</td>
+<td>5,508</td>
+<td>3,998</td>
+<td>2,905</td>
+<td>12,411</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.38">v0.10.38</a></td>
@@ -944,8 +953,8 @@
 <td>2017-11-24T14:27:49Z</td>
 <td>136</td>
 <td>676</td>
-<td>5,455</td>
-<td>6,267</td>
+<td>5,458</td>
+<td>6,270</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.23">v0.10.23</a></td>
--- a/docs/terminal/index.html
+++ b/docs/terminal/index.html
@@ -261,7 +261,8 @@
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplinapp.org/changelog">Changelog</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli">Changelog (CLI App)</a></li>
 <li><a href="https://joplinapp.org/stats">Stats</a></li>
 <li><a href="https://joplinapp.org/donate">Donate</a></li>
 </ul>
--- a/readme/changelog.md
+++ b/readme/changelog.md
@@ -1,5 +1,18 @@
 # Joplin changelog

+## [v1.0.152](https://github.com/laurent22/joplin/releases/tag/v1.0.152) - 2019-05-13T09:08:07Z
+
+Same as v1.0.151 but with a fix to the migration issue, that was in turns affecting synchronisation.
+
+- New: Support for note history ([#1415](https://github.com/laurent22/joplin/issues/1415)) ([#712](https://github.com/laurent22/joplin/issues/712))
+- Improved: Save size of a resource to the database; and added mechanism to run non-database migrations
+- Improved: Improved note deletion dialog ([#1502](https://github.com/laurent22/joplin/issues/1502))
+- Fixed: Allow resources greater than 10 MB but they won't be synced on mobile ([#371](https://github.com/laurent22/joplin/issues/371))
+- Fixed: Improved handling of images when using external editor, so that it works in Atom, VSCode and Typora ([#1425](https://github.com/laurent22/joplin/issues/1425))
+- Fixed: Some images were not being displayed
+- Fixed: Resets the undo manager when creating new notes ([#1495](https://github.com/laurent22/joplin/issues/1495)) ([#355](https://github.com/laurent22/joplin/issues/355))
+- Fixed: Prevents notes with no title to break after synchronize ([#1472](https://github.com/laurent22/joplin/issues/1472))
+
 ## [v1.0.151](https://github.com/laurent22/joplin/releases/tag/v1.0.151) - 2019-05-12T15:14:32Z

 Same as v1.0.150 but with a small fix to set the resources file size.
--- a/readme/changelog_cli.md
+++ b/readme/changelog_cli.md
@@ -1,5 +1,18 @@
 # Joplin terminal app changelog

+## [cli-v1.0.133](https://github.com/laurent22/joplin/releases/tag/cli-v1.0.133) - 2019-05-13T22:55:40Z
+
+- New: Added option to disable creation of welcome items
+- New: Support for note history (#1415) (#712)
+- Improved: Save size of a resource to the database; and added mechanism to run non-database migrations
+- Improved: Display better error message when trying to sync with a new sync target from an old version of Joplin
+- Improved: Update sharp (for node 12 compatibility) (#1471)
+- Fixed: Do not resize images if they are already below the max dimensions
+- Fixed: Allow resources greater than 10 MB but they won't be synced on mobile (#371)
+- Fixed: Bump sqlite3 to v4.0.7 for node12 support (#1508)
+- Fixed: Prevents notes with no title to break after synchronize (#1472)
+- Fixed: Import lists and sub-lists from Enex files with correct indentation (#1476)
+
 ## [cli-v1.0.125](https://github.com/laurent22/joplin/releases/tag/cli-v1.0.125) - 2019-04-29T18:38:05Z

 - Improved: Improved support for Japanese, Chinese, Korean search queries (also applies to Goto Anything)
--- a/readme/faq.md
+++ b/readme/faq.md
@@ -1,4 +1,4 @@
-# Clicking 'Edit in External Editor' does nothing! / I want to change the editor!
+# How can I edit my note in an external text editor?

 The editor command (may include arguments) defines which editor will be used to open a note. If none is provided it will try to auto-detect the default editor. If this does nothing or you want to change it for Joplin, you need to configure it in the Preferences -> Text editor command.

@@ -55,13 +55,15 @@ Whenever importing a large number of notes, for example from Evernote, it may ta

 Unfortunately it is not possible. Joplin synchronises with file systems using an open format however it does not mean the sync files are meant to be user-editable. The format is designed to be performant and reliable, not user friendly (it cannot be both), and that cannot be changed. Joplin sync directory is basically just a database.

-# Could there be a PIN or password to restrict access to Joplin?
+# Could there be a password to restrict access to Joplin?

-Short answer: no. The end to end encryption that Joplin implements is to protect the data during transmission and on the cloud service so that only you can access it.
+The end to end encryption that Joplin implements is to protect the data during transmission and on the cloud service so that only you can access it.

 On the local device it is assumed that the data is safe due to the OS built-in security features. If additional security is needed it's always possible to put the notes on an encrypted Truecrypt drive for instance.

-If someone that you don't trust has access to the computer, they can put a keylogger anyway so any local encryption or PIN access would not be useful.
+For these reasons, because the OS or yourself can easily protect the local data, no PIN or password is currently supported to access Joplin.
+
+There is however an issue open about it, so pull requests are welcome: https://github.com/laurent22/joplin/issues/289

 # WebDAV synchronisation is not working

@@ -86,14 +88,10 @@ In this case, [make sure you enter the correct WebDAV URL](https://github.com/la
 - Check the WebDAV URL - to get the correct URL, go to Nextcloud and, in the left sidebar, click on "Settings" and copy the WebDAV URL from there. **Do not forget to add the folder you've created to that URL**. For example, if the base the WebDAV URL is "https://example.com/nextcloud/remote.php/webdav/" and you want the notes to be synced in the "Joplin" directory, you need to give the URL "https://example.com/nextcloud/remote.php/webdav/Joplin" **and you need to create the "Joplin" directory yourself**.
 - Did you enable **2FA** (Multi-factor authentication) on Nextcloud? In that case, you need to [create a one-time password for Joplin on the Nextcloud admin interface](https://github.com/laurent22/joplin/issues/1453#issuecomment-486640902).

-# Could you publish Joplin on F-droid?
+# How can I use self-signed SSL certificates on Android?

-Joplin relies on Firebase to enable reliable notifications on Android. Since F-Droid [do not accept applications that depend on this package](https://gitlab.com/fdroid/rfp/issues/434#note_55239154), it is not currently possible to have Joplin in that repository. To avoid using Google Play, you have the option to directly download the Joplin APK file.
+If you want to serve using https but can't or don't want to use SSL certificates signed by trusted certificate authorities (like "Let's Encrypt"), it's possible to generate a custom CA and sign your certificates with it. You can generate the CA and certificates using [openssl](https://gist.github.com/fntlnz/cf14feb5a46b2eda428e000157447309), but I like to use a tool called [mkcert](https://github.com/FiloSottile/mkcert) for it's simplicity. Finally, you have to add your CA certificate to Android settings so that Android can recognize the certificates you signed with your CA as valid ([link](https://support.google.com/nexus/answer/2844832?hl=en-GB)).

 # Why is it named Joplin?

 The name comes from the composer and pianist [Scott Joplin](https://en.wikipedia.org/wiki/Scott_Joplin), which I often listen to. His name is also easy to remember and type so it fell like a good choice. And, to quote a user on Hacker News, "though Scott Joplin's ragtime musical style has a lot in common with some very informal music, his own approach was more educated, sophisticated, and precise. Every note was in its place for a reason, and he was known to prefer his pieces to be performed exactly as written. So you could say that compared to the people who came before him, his notes were more organized".
-
-# How can I use self-signed SSL certificates on Android?
-
-If you want to serve using https but can't or don't want to use SSL certificates signed by trusted certificate authorities (like "Let's Encrypt"), it's possible to generate a custom CA and sign your certificates with it. You can generate the CA and certificates using [openssl](https://gist.github.com/fntlnz/cf14feb5a46b2eda428e000157447309), but I like to use a tool called [mkcert](https://github.com/FiloSottile/mkcert) for it's simplicity. Finally, you have to add your CA certificate to Android settings so that Android can recognize the certificates you signed with your CA as valid ([link](https://support.google.com/nexus/answer/2844832?hl=en-GB)).
--- a/readme/stats.md
+++ b/readme/stats.md
@@ -2,27 +2,28 @@

 Name | Value
 --- | ---
-Total Windows downloads | 245,069
-Total macOs downloads | 107,315
-Total Linux downloads | 84,788
+Total Windows downloads | 248,416
+Total macOs downloads | 108,379
+Total Linux downloads | 85,974
 Windows % | 56%
-macOS % | 25%
+macOS % | 24%
 Linux % | 19%

 Version | Date | Windows | macOS | Linux | Total
 --- | --- | --- | --- | --- | ---
-[v1.0.151](https://github.com/laurent22/joplin/releases/tag/v1.0.151) | 2019-05-12T15:14:32Z | 1   | 0   | 0   | 1  
-[v1.0.150](https://github.com/laurent22/joplin/releases/tag/v1.0.150) | 2019-05-12T11:27:48Z | 281 | 82  | 48  | 411
-[v1.0.148](https://github.com/laurent22/joplin/releases/tag/v1.0.148) | 2019-05-08T19:12:24Z | 108 | 32  | 72  | 212
-[v1.0.145](https://github.com/laurent22/joplin/releases/tag/v1.0.145) | 2019-05-03T09:16:53Z | 6,790 | 2,771 | 1,419 | 10,980
-[v1.0.143](https://github.com/laurent22/joplin/releases/tag/v1.0.143) | 2019-04-22T10:51:38Z | 11,554 | 3,505 | 2,760 | 17,819
-[v1.0.142](https://github.com/laurent22/joplin/releases/tag/v1.0.142) | 2019-04-02T16:44:51Z | 14,472 | 4,508 | 4,705 | 23,685
-[v1.0.140](https://github.com/laurent22/joplin/releases/tag/v1.0.140) | 2019-03-10T20:59:58Z | 13,450 | 4,110 | 2,983 | 20,543
+[v1.0.152](https://github.com/laurent22/joplin/releases/tag/v1.0.152) | 2019-05-13T09:08:07Z | 1,320 | 491 | 225 | 2,036
+[v1.0.151](https://github.com/laurent22/joplin/releases/tag/v1.0.151) | 2019-05-12T15:14:32Z | 1,856 | 498 | 943 | 3,297
+[v1.0.150](https://github.com/laurent22/joplin/releases/tag/v1.0.150) | 2019-05-12T11:27:48Z | 375 | 107 | 53  | 535
+[v1.0.148](https://github.com/laurent22/joplin/releases/tag/v1.0.148) | 2019-05-08T19:12:24Z | 108 | 33  | 73  | 214
+[v1.0.145](https://github.com/laurent22/joplin/releases/tag/v1.0.145) | 2019-05-03T09:16:53Z | 6,823 | 2,817 | 1,422 | 11,062
+[v1.0.143](https://github.com/laurent22/joplin/releases/tag/v1.0.143) | 2019-04-22T10:51:38Z | 11,587 | 3,505 | 2,760 | 17,852
+[v1.0.142](https://github.com/laurent22/joplin/releases/tag/v1.0.142) | 2019-04-02T16:44:51Z | 14,472 | 4,508 | 4,706 | 23,686
+[v1.0.140](https://github.com/laurent22/joplin/releases/tag/v1.0.140) | 2019-03-10T20:59:58Z | 13,454 | 4,110 | 2,983 | 20,547
 [v1.0.139](https://github.com/laurent22/joplin/releases/tag/v1.0.139) | 2019-03-09T10:06:48Z | 83  | 19  | 24  | 126
 [v1.0.138](https://github.com/laurent22/joplin/releases/tag/v1.0.138) | 2019-03-03T17:23:00Z | 111 | 41  | 68  | 220
 [v1.0.137](https://github.com/laurent22/joplin/releases/tag/v1.0.137) | 2019-03-03T01:12:51Z | 547 | 26  | 68  | 641
-[v1.0.135](https://github.com/laurent22/joplin/releases/tag/v1.0.135) | 2019-02-27T23:36:57Z | 12,140 | 3,915 | 4,044 | 20,099
-[v1.0.134](https://github.com/laurent22/joplin/releases/tag/v1.0.134) | 2019-02-27T10:21:44Z | 1,428 | 531 | 201 | 2,160
+[v1.0.135](https://github.com/laurent22/joplin/releases/tag/v1.0.135) | 2019-02-27T23:36:57Z | 12,142 | 3,915 | 4,044 | 20,101
+[v1.0.134](https://github.com/laurent22/joplin/releases/tag/v1.0.134) | 2019-02-27T10:21:44Z | 1,430 | 532 | 201 | 2,163
 [v1.0.132](https://github.com/laurent22/joplin/releases/tag/v1.0.132) | 2019-02-26T23:02:05Z | 1,046 | 411 | 79  | 1,536
 [v1.0.127](https://github.com/laurent22/joplin/releases/tag/v1.0.127) | 2019-02-14T23:12:48Z | 9,385 | 3,127 | 2,904 | 15,416
 [v1.0.126](https://github.com/laurent22/joplin/releases/tag/v1.0.126) | 2019-02-09T19:46:16Z | 914 | 53  | 108 | 1,075
@@ -34,7 +35,7 @@ Version | Date | Windows | macOS | Linux | Total
 [v1.0.116](https://github.com/laurent22/joplin/releases/tag/v1.0.116) | 2018-11-20T19:09:24Z | 3,458 | 1,087 | 704 | 5,249
 [v1.0.115](https://github.com/laurent22/joplin/releases/tag/v1.0.115) | 2018-11-16T16:52:02Z | 3,628 | 1,279 | 783 | 5,690
 [v1.0.114](https://github.com/laurent22/joplin/releases/tag/v1.0.114) | 2018-10-24T20:14:10Z | 11,369 | 3,475 | 3,822 | 18,666
-[v1.0.111](https://github.com/laurent22/joplin/releases/tag/v1.0.111) | 2018-09-30T20:15:09Z | 11,869 | 3,134 | 3,648 | 18,651
+[v1.0.111](https://github.com/laurent22/joplin/releases/tag/v1.0.111) | 2018-09-30T20:15:09Z | 11,869 | 3,134 | 3,649 | 18,652
 [v1.0.110](https://github.com/laurent22/joplin/releases/tag/v1.0.110) | 2018-09-29T12:29:21Z | 926 | 376 | 103 | 1,405
 [v1.0.109](https://github.com/laurent22/joplin/releases/tag/v1.0.109) | 2018-09-27T18:01:41Z | 2,074 | 680 | 311 | 3,065
 [v1.0.108](https://github.com/laurent22/joplin/releases/tag/v1.0.108) | 2018-09-29T18:49:29Z | 13  | 6   | 5   | 24 
@@ -47,14 +48,14 @@ Version | Date | Windows | macOS | Linux | Total
 [v1.0.100](https://github.com/laurent22/joplin/releases/tag/v1.0.100) | 2018-06-14T17:41:43Z | 857 | 410 | 228 | 1,495
 [v1.0.99](https://github.com/laurent22/joplin/releases/tag/v1.0.99) | 2018-06-10T13:18:23Z | 1,238 | 581 | 372 | 2,191
 [v1.0.97](https://github.com/laurent22/joplin/releases/tag/v1.0.97) | 2018-06-09T19:23:34Z | 297 | 138 | 54  | 489
-[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z | 2,686 | 1,200 | 1,261 | 5,147
+[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z | 2,686 | 1,200 | 1,262 | 5,148
 [v1.0.95](https://github.com/laurent22/joplin/releases/tag/v1.0.95) | 2018-05-25T13:04:30Z | 387 | 190 | 87  | 664
 [v1.0.94](https://github.com/laurent22/joplin/releases/tag/v1.0.94) | 2018-05-21T20:52:59Z | 1,099 | 557 | 362 | 2,018
 [v1.0.93](https://github.com/laurent22/joplin/releases/tag/v1.0.93) | 2018-05-14T11:36:01Z | 1,770 | 921 | 742 | 3,433
 [v1.0.91](https://github.com/laurent22/joplin/releases/tag/v1.0.91) | 2018-05-10T14:48:04Z | 814 | 535 | 290 | 1,639
 [v1.0.89](https://github.com/laurent22/joplin/releases/tag/v1.0.89) | 2018-05-09T13:05:05Z | 476 | 212 | 97  | 785
 [v1.0.85](https://github.com/laurent22/joplin/releases/tag/v1.0.85) | 2018-05-01T21:08:24Z | 1,641 | 934 | 616 | 3,191
-[v1.0.83](https://github.com/laurent22/joplin/releases/tag/v1.0.83) | 2018-04-04T19:43:58Z | 4,558 | 2,434 | 2,632 | 9,624
+[v1.0.83](https://github.com/laurent22/joplin/releases/tag/v1.0.83) | 2018-04-04T19:43:58Z | 4,560 | 2,434 | 2,632 | 9,626
 [v1.0.82](https://github.com/laurent22/joplin/releases/tag/v1.0.82) | 2018-03-31T19:16:31Z | 684 | 386 | 99  | 1,169
 [v1.0.81](https://github.com/laurent22/joplin/releases/tag/v1.0.81) | 2018-03-28T08:13:58Z | 985 | 569 | 749 | 2,303
 [v1.0.79](https://github.com/laurent22/joplin/releases/tag/v1.0.79) | 2018-03-23T18:00:11Z | 919 | 512 | 357 | 1,788
@@ -68,7 +69,7 @@ Version | Date | Windows | macOS | Linux | Total
 [v1.0.64](https://github.com/laurent22/joplin/releases/tag/v1.0.64) | 2018-02-16T00:58:20Z | 1,074 | 529 | 1,116 | 2,719
 [v1.0.63](https://github.com/laurent22/joplin/releases/tag/v1.0.63) | 2018-02-14T19:40:36Z | 291 | 143 | 83  | 517
 [v1.0.62](https://github.com/laurent22/joplin/releases/tag/v1.0.62) | 2018-02-12T20:19:58Z | 549 | 277 | 355 | 1,181
-[v0.10.61](https://github.com/laurent22/joplin/releases/tag/v0.10.61) | 2018-02-08T18:27:39Z | 963 | 605 | 944 | 2,512
+[v0.10.61](https://github.com/laurent22/joplin/releases/tag/v0.10.61) | 2018-02-08T18:27:39Z | 963 | 605 | 945 | 2,513
 [v0.10.60](https://github.com/laurent22/joplin/releases/tag/v0.10.60) | 2018-02-06T13:09:56Z | 711 | 498 | 542 | 1,751
 [v0.10.54](https://github.com/laurent22/joplin/releases/tag/v0.10.54) | 2018-01-31T20:21:30Z | 1,811 | 1,441 | 309 | 3,561
 [v0.10.52](https://github.com/laurent22/joplin/releases/tag/v0.10.52) | 2018-01-31T19:25:18Z | 37  | 616 | 6   | 659
@@ -78,7 +79,7 @@ Version | Date | Windows | macOS | Linux | Total
 [v0.10.43](https://github.com/laurent22/joplin/releases/tag/v0.10.43) | 2018-01-08T10:12:10Z | 3,427 | 2,328 | 1,198 | 6,953
 [v0.10.41](https://github.com/laurent22/joplin/releases/tag/v0.10.41) | 2018-01-05T20:38:12Z | 1,029 | 1,529 | 228 | 2,786
 [v0.10.40](https://github.com/laurent22/joplin/releases/tag/v0.10.40) | 2018-01-02T23:16:57Z | 1,586 | 1,752 | 327 | 3,665
-[v0.10.39](https://github.com/laurent22/joplin/releases/tag/v0.10.39) | 2017-12-11T21:19:44Z | 5,506 | 3,996 | 2,903 | 12,405
+[v0.10.39](https://github.com/laurent22/joplin/releases/tag/v0.10.39) | 2017-12-11T21:19:44Z | 5,508 | 3,998 | 2,905 | 12,411
 [v0.10.38](https://github.com/laurent22/joplin/releases/tag/v0.10.38) | 2017-12-08T10:12:06Z | 1,041 | 1,213 | 299 | 2,553
 [v0.10.37](https://github.com/laurent22/joplin/releases/tag/v0.10.37) | 2017-12-07T19:38:05Z | 256 | 829 | 74  | 1,159
 [v0.10.36](https://github.com/laurent22/joplin/releases/tag/v0.10.36) | 2017-12-05T09:34:40Z | 1,008 | 1,340 | 430 | 2,778
@@ -89,7 +90,7 @@ Version | Date | Windows | macOS | Linux | Total
 [v0.10.30](https://github.com/laurent22/joplin/releases/tag/v0.10.30) | 2017-11-30T20:28:16Z | 711 | 1,352 | 410 | 2,473
 [v0.10.28](https://github.com/laurent22/joplin/releases/tag/v0.10.28) | 2017-11-30T01:07:46Z | 1,277 | 1,682 | 864 | 3,823
 [v0.10.26](https://github.com/laurent22/joplin/releases/tag/v0.10.26) | 2017-11-29T16:02:17Z | 180 | 685 | 255 | 1,120
-[v0.10.25](https://github.com/laurent22/joplin/releases/tag/v0.10.25) | 2017-11-24T14:27:49Z | 136 | 676 | 5,455 | 6,267
+[v0.10.25](https://github.com/laurent22/joplin/releases/tag/v0.10.25) | 2017-11-24T14:27:49Z | 136 | 676 | 5,458 | 6,270
 [v0.10.23](https://github.com/laurent22/joplin/releases/tag/v0.10.23) | 2017-11-21T19:38:41Z | 124 | 628 | 20  | 772
 [v0.10.22](https://github.com/laurent22/joplin/releases/tag/v0.10.22) | 2017-11-20T21:45:57Z | 76  | 627 | 11  | 714
 [v0.10.21](https://github.com/laurent22/joplin/releases/tag/v0.10.21) | 2017-11-18T00:53:15Z | 44  | 619 | 4   | 667
Author	SHA1	Message	Date
Laurent Cozic	451b9c0ae9	CLI v1.0.133	2019-05-13 23:55:53 +01:00
Laurent Cozic	047897621a	Fix CLI build script	2019-05-13 23:52:12 +01:00
Laurent Cozic	52e5cec585	Update website	2019-05-13 23:41:31 +01:00
Laurent Cozic	bc98b65efa	Update website	2019-05-13 23:23:57 +01:00
Laurent Cozic	9250e77862	Added link to CLI changelog	2019-05-13 23:23:42 +01:00
Laurent Cozic	cd69e71945	Forgot to publish in publish script	2019-05-13 23:20:25 +01:00
Laurent Cozic	e705e6e990	CLI v1.0.129	2019-05-13 23:18:57 +01:00
Laurent Cozic	4638f11c5e	Created CLI release script with changelog auto-generation	2019-05-13 23:18:44 +01:00