From 143b1a73f755c4fa012eeec547d9cfd80e6369a2 Mon Sep 17 00:00:00 2001 From: antelle Date: Thu, 31 Dec 2020 17:24:59 +0100 Subject: [PATCH 1/5] fix #1671: new lines removal issue in notes --- app/scripts/models/entry-model.js | 2 +- package-lock.json | 18 +++++++++--------- package.json | 2 +- release-notes.md | 3 +++ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/scripts/models/entry-model.js b/app/scripts/models/entry-model.js index 58841b02..1e1700c9 100644 --- a/app/scripts/models/entry-model.js +++ b/app/scripts/models/entry-model.js @@ -339,7 +339,7 @@ class EntryModel extends Model { if (val && !val.isProtected) { // https://github.com/keeweb/keeweb/issues/910 // eslint-disable-next-line no-control-regex - val = val.replace(/[\x00-\x1F\uFFF0-\uFFFF]/g, ''); + val = val.replace(/[\x00-\x09\x0B-\x0C\x0E-\x1F\uFFF0-\uFFFF]/g, ''); } return val; } diff --git a/package-lock.json b/package-lock.json index df70bb46..fa8ea35d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4887,9 +4887,9 @@ } }, "date-and-time": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-0.14.1.tgz", - "integrity": "sha512-M4RggEH5OF2ZuCOxgOU67R6Z9ohjKbxGvAQz48vj53wLmL0bAgumkBvycR32f30pK+Og9pIR+RFDyChbaE4oLA==" + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-0.14.2.tgz", + "integrity": "sha512-EFTCh9zRSEpGPmJaexg7HTuzZHh6cnJj1ui7IGCFNXzd2QdpsNh05Db5TF3xzJm30YN+A8/6xHSuRcQqoc3kFA==" }, "date-time": { "version": "1.1.0", @@ -9157,9 +9157,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "internal-ip": { "version": "4.3.0", @@ -9783,9 +9783,9 @@ } }, "kdbxweb": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-1.14.0.tgz", - "integrity": "sha512-Hg+PBdur4Mp/pmKuj1vZfYB4uCONdNlJI8H65VO5beK/EexRwuJQBSxW8mIbHHrLP701Q2KDlc7GLeSrs3dRMA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-1.14.1.tgz", + "integrity": "sha512-eu1R3zubQnxaHl6ZHkSIt8+ob/EZocUDdvTuTno1uoc+0JREMRlcWSHm8E+ficREBN9EMaXmwofJOjwXjKKzPQ==", "requires": { "pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc", "text-encoding": "github:keeweb/text-encoding#4dfb7cb0954c222852092f8b06ae4f6b4f60bfbb", diff --git a/package.json b/package.json index 46588ba6..e6d8fac1 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "jquery": "3.5.1", "json-loader": "^0.5.7", "jsqrcode": "github:antelle/jsqrcode#0.1.3", - "kdbxweb": "^1.14.0", + "kdbxweb": "^1.14.1", "load-grunt-tasks": "5.1.0", "lodash": "^4.17.20", "marked": "^1.2.7", diff --git a/release-notes.md b/release-notes.md index a7486548..b377b261 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,8 @@ Release notes ------------- +##### v1.16.7 (2020-12-31) +`-` fix #1671: new lines removal issue in notes + ##### v1.16.6 (2020-12-30) `-` fix #1668: opening files with bad characters `*` upgraded a vulnerable dependency From f8894889154bab3ab729c5436aab5ccfc954225d Mon Sep 17 00:00:00 2001 From: antelle Date: Thu, 31 Dec 2020 17:26:18 +0100 Subject: [PATCH 2/5] bump version --- desktop/package-lock.json | 2 +- desktop/package.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 6d240a72..6c2d0da8 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.16.6", + "version": "1.16.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/desktop/package.json b/desktop/package.json index d88efab5..9d99c4b0 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.16.6", + "version": "1.16.7", "description": "Free cross-platform password manager compatible with KeePass", "main": "main.js", "homepage": "https://keeweb.info", diff --git a/package-lock.json b/package-lock.json index fa8ea35d..90f28cc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.16.6", + "version": "1.16.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e6d8fac1..7f42f201 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.16.6", + "version": "1.16.7", "description": "Free cross-platform password manager compatible with KeePass", "main": "Gruntfile.js", "private": true, From a13d44d560e2eff9d6b8058ad1fd291044f75f06 Mon Sep 17 00:00:00 2001 From: antelle Date: Fri, 1 Jan 2021 19:55:30 +0100 Subject: [PATCH 3/5] discussions link --- .github/ISSUE_TEMPLATE/discussion.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/discussion.md b/.github/ISSUE_TEMPLATE/discussion.md index 3c727a31..1cef4da8 100644 --- a/.github/ISSUE_TEMPLATE/discussion.md +++ b/.github/ISSUE_TEMPLATE/discussion.md @@ -1,8 +1,5 @@ --- name: Discussion about: Discuss any topic or idea -title: '' -labels: '' -assignees: '' - +url: https://github.com/keeweb/keeweb/discussions/new --- From 23bb30be9283649c880784fdaf5db2ee9c63d84c Mon Sep 17 00:00:00 2001 From: antelle Date: Fri, 1 Jan 2021 19:57:42 +0100 Subject: [PATCH 4/5] issue links --- .github/ISSUE_TEMPLATE/config.yml | 5 +++++ .github/ISSUE_TEMPLATE/discussion.md | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/ISSUE_TEMPLATE/discussion.md diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..6a05421b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: Discussions + url: https://github.com/keeweb/keeweb/discussions + about: A place to ask and answer questions or discuss different topics diff --git a/.github/ISSUE_TEMPLATE/discussion.md b/.github/ISSUE_TEMPLATE/discussion.md deleted file mode 100644 index 1cef4da8..00000000 --- a/.github/ISSUE_TEMPLATE/discussion.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -name: Discussion -about: Discuss any topic or idea -url: https://github.com/keeweb/keeweb/discussions/new ---- From 8ab4e7c433b23373a2326533bc8aceaae66718ee Mon Sep 17 00:00:00 2001 From: antelle Date: Fri, 1 Jan 2021 20:06:21 +0100 Subject: [PATCH 5/5] twitter link --- .github/ISSUE_TEMPLATE/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 6a05421b..52480d98 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -3,3 +3,6 @@ contact_links: - name: Discussions url: https://github.com/keeweb/keeweb/discussions about: A place to ask and answer questions or discuss different topics + - name: Twitter + url: https://twitter.com/kee_web + about: Ask a quick question there if you like Twitter more