self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Merge branch 'release-1.4' into dev

Browse Source
This commit is contained in:
Laurent Cozic 2020-11-26 12:16:52 +00:00
commit 511e4b1da0
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-cli/package-lock.json generated
View File

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

2
packages/app-cli/package.json
View File

@ -31,7 +31,7 @@
],
"owner": "Laurent Cozic"
},
"version": "1.4.3",
"version": "1.4.7",
"bin": {
"joplin": "./main.js"
},

4
packages/tools/git-changelog.js
View File

@ -47,7 +47,7 @@ async function gitLog(sinceTag) {
async function gitTags() {
const lines = await execCommand('git tag --sort=committerdate');
return lines.split('\n').map(l => l.trim());
return lines.split('\n').map(l => l.trim()).filter(l => !!l);
}
function platformFromTag(tagName) {
@ -57,7 +57,7 @@ function platformFromTag(tagName) {
if (tagName.indexOf('clipper') === 0) return 'clipper';
if (tagName.indexOf('cli') === 0) return 'cli';
if (tagName.indexOf('plugin-generator') === 0) return 'plugin-generator';
throw new Error(`Could not determine platform from tag: ${tagName}`);
throw new Error(`Could not determine platform from tag: "${tagName}"`);
}
// function tagPrefixFromPlatform(platform) {

6
packages/tools/release-cli.js
View File

@ -50,7 +50,7 @@ async function insertChangelog(tag, changelog) {
async function main() {
process.chdir(appDir);
const newVersion = await execCommand('npm version patch');
const newVersion = (await execCommand('npm version patch')).trim();
console.info(`Building ${newVersion}...`);
const newTag = `cli-${newVersion}`;
@ -63,13 +63,13 @@ async function main() {
await execCommand('npm publish');
const changelog = await execCommand(`node ${rootDir}/packages/tools/git-changelog ${newTag}`);
const changelog = (await execCommand(`node ${rootDir}/packages/tools/git-changelog ${newTag}`)).trim();
const newChangelog = await insertChangelog(newTag, changelog);
await fs.writeFile(changelogPath, newChangelog);
const defaultEditor = await execCommand('echo $EDITOR');
const defaultEditor = (await execCommand('echo $EDITOR')).trim();
const finalCmds = [
'git pull',

8
readme/changelog_cli.md
View File

@ -1,5 +1,13 @@
# Joplin terminal app changelog
## [cli-v1.4.7](https://github.com/laurent22/joplin/releases/tag/cli-v1.4.7) - 2020-11-26T12:15:28Z
- Improved: Allow exporting conflict notes (#4095)
- Improved: Allow lowercase filters when doing search
- Improved: Refresh sidebar and notes when moving note outside of conflict folder
- Fixed: Fix handling of new line escaping when using external edit
- Fixed: Fixed importing certain ENEX files that contain invalid dates
## [cli-v1.4.3](https://github.com/laurent22/joplin/releases/tag/cli-v1.4.3) - 2020-11-06T21:19:29Z
IMPORTANT: If you use the web API, please note that there are a few breaking changes in this release. See here for more information: https://github.com/laurent22/joplin/pull/3983#issue-509624899