From 1e8325be9dee41071c0661fa67c419f0094547a0 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 3 Nov 2017 17:40:57 +0000 Subject: [PATCH 1/2] Updated Readme --- README.md | 2 +- ReactNativeClient/android/app/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0d945502b..fc5d0ab5e 100644 --- a/README.md +++ b/README.md @@ -358,7 +358,7 @@ The following commands are available in [command-line mode](#command-line-mode): # Known bugs - Non-alphabetical characters such as Chinese or Arabic might create glitches in the user interface on Windows. This is a limitation of the current Windows console. -- In the React Native app, changing the notebook of a note sometimes has no effect, due to [this bug](https://github.com/facebook/react-native/issues/15556). +- In the React Native app, changing the notebook of a note sometimes has no effect, due to [this bug](https://github.com/facebook/react-native/issues/15556). Due to [this other bug](https://github.com/facebook/react-native/issues/13351), changing one config value sometimes also set a different one. Waiting for Facebook to fix React Native. # License diff --git a/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle index 4a5f19ed9..19959d52d 100644 --- a/ReactNativeClient/android/app/build.gradle +++ b/ReactNativeClient/android/app/build.gradle @@ -90,8 +90,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion 16 targetSdkVersion 22 - versionCode 53 - versionName "0.9.40" + versionCode 54 + versionName "0.9.41" ndk { abiFilters "armeabi-v7a", "x86" } From dd4a6404808e1052e6d56262bf63351538226844 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Tue, 7 Nov 2017 18:05:49 +0000 Subject: [PATCH 2/2] Version --- CliClient/package-lock.json | 95 ++++++++++++++++++++++++++++++------- CliClient/package.json | 4 +- 2 files changed, 80 insertions(+), 19 deletions(-) diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json index 0cfe20ef7..8d1bd63e9 100644 --- a/CliClient/package-lock.json +++ b/CliClient/package-lock.json @@ -1,6 +1,6 @@ { "name": "joplin", - "version": "0.10.65", + "version": "0.10.66", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3588,6 +3588,53 @@ "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=", "dev": true }, + "emphasize": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/emphasize/-/emphasize-1.5.0.tgz", + "integrity": "sha1-48WvLdzLSYKCKjNJtHFhPMfOzJI=", + "requires": { + "chalk": "1.1.3", + "highlight.js": "9.12.0", + "lowlight": "1.9.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } + } + }, "encoding": { "version": "0.1.12", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", @@ -3853,7 +3900,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, "requires": { "ansi-regex": "2.1.1" }, @@ -3861,8 +3907,7 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" } } }, @@ -3895,6 +3940,11 @@ "sntp": "2.1.0" } }, + "highlight.js": { + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz", + "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=" + }, "hoek": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", @@ -4259,6 +4309,14 @@ "js-tokens": "3.0.2" } }, + "lowlight": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.9.1.tgz", + "integrity": "sha512-CpDhyVhI+xHjruiGvH2F/Fr5q5aTn5A6Oyh7MI+4oI8G0A1E7p9a3Zqv9Hzx9WByK8gAiNifEueAXz+cA2xdEA==", + "requires": { + "highlight.js": "9.12.0" + } + }, "md5": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz", @@ -4395,12 +4453,6 @@ "resolved": "https://registry.npmjs.org/node-bitmap/-/node-bitmap-0.0.1.tgz", "integrity": "sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=" }, - "node-emoji": { - "version": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5", - "requires": { - "lodash.toarray": "4.4.0" - } - }, "node-fetch": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", @@ -5654,9 +5706,9 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, "string-kit": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.6.2.tgz", - "integrity": "sha512-cKHH+s3kZHaoIwxM1BzhPY2fcYa/rNubUkMKyrOjNjrDgroGPyJDLflTYRRXhx6orfdOi0M2sYsuBa80oedeLA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/string-kit/-/string-kit-0.6.3.tgz", + "integrity": "sha512-G2T92klsuE+S9mqdKQyWurFweNQV5X+FRzSKTqYHRdaVUN/4dL6urbYJJ+xb9ep/4XWm+4RNT8j3acncNhFRBg==", "requires": { "xregexp": "3.2.0" } @@ -5761,7 +5813,7 @@ "get-pixels": "3.3.0", "ndarray": "1.0.18", "nextgen-events": "0.10.2", - "string-kit": "0.6.2", + "string-kit": "0.6.3", "tree-kit": "0.5.26" } }, @@ -5771,16 +5823,25 @@ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "tkwidgets": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.19.tgz", - "integrity": "sha512-Etskz52RInmmB1aGD9cIodIZ33Gwf0yPP3+lh6ceANgS4N8LpquQajDRyahjZnvwDhfYdo1N87eEKzXBJbLQDg==", + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.20.tgz", + "integrity": "sha512-9wGsMrrFJvE/6TKUc0dEFFhwxvZLeNsYOxnpy1JCwyk/hYCEF70nuvk7VvJeG4TPaQBaGKPj6c7pCgdREvz4Jw==", "requires": { "chalk": "2.3.0", + "emphasize": "1.5.0", "node-emoji": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5", "slice-ansi": "1.0.0", "string-width": "2.1.1", "terminal-kit": "1.14.0", "wrap-ansi": "3.0.1" + }, + "dependencies": { + "node-emoji": { + "version": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5", + "requires": { + "lodash.toarray": "4.4.0" + } + } } }, "to-fast-properties": { diff --git a/CliClient/package.json b/CliClient/package.json index a7ac4c572..f75bd3047 100644 --- a/CliClient/package.json +++ b/CliClient/package.json @@ -18,7 +18,7 @@ ], "owner": "Laurent Cozic" }, - "version": "0.10.65", + "version": "0.10.66", "bin": { "joplin": "./main.js" }, @@ -55,7 +55,7 @@ "string-to-stream": "^1.1.0", "strip-ansi": "^4.0.0", "tcp-port-used": "^0.1.2", - "tkwidgets": "^0.5.19", + "tkwidgets": "^0.5.20", "uuid": "^3.0.1", "word-wrap": "^1.2.3", "yargs-parser": "^7.0.0"