From fe47449091b38b619094c3a4e71db1746a771a13 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 13 Jan 2020 11:21:57 -0500 Subject: [PATCH 1/6] Bump version to 1.14.0-beta.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6f20c486f..af89f6fc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "simplenote", - "version": "1.12.0", + "version": "1.14.0-beta.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 674074e1a..340628cbb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "email": "support@simplenote.com" }, "productName": "Simplenote", - "version": "1.12.0", + "version": "1.14.0-beta.1", "main": "desktop/index.js", "license": "GPL-2.0", "homepage": "https://simplenote.com", From 211156087b9be1014f50caf2c3d289a11047cd3c Mon Sep 17 00:00:00 2001 From: Jonathan Belcher Date: Fri, 17 Jan 2020 10:34:34 -0500 Subject: [PATCH 2/6] Cycle the token (#1846) --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 084bd9b7e..383e2c20e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ environment: CSC_KEY_PASSWORD: secure: Sz53shy7P4kPzBKa9shHTw== GH_TOKEN: - secure: rgCznyrNnbERL0+MFoT/48TazSzqodduLapcquSs2D3hidBCwjbaOUkE9wXIi3WG + secure: YT95oZAVxC7cDNT/XzUpN8fDwfysXTKETux44ta/sfm7gAo/Wghm1ZWCElNqvAKx APPVEYOR_RDP_PASSWORD: secure: G+yYok+QzBzcrkdhtx+UC4vjyU0kSlWRQ+l+iooLV7o= CSC_LINK: .\resources\certificates\win.p12 @@ -75,4 +75,4 @@ cache: # RDP Debug mode # on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) \ No newline at end of file +# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) From 5711630d395a69a5aa0802cdd08f58b7417973f2 Mon Sep 17 00:00:00 2001 From: Jonathan Belcher Date: Mon, 20 Jan 2020 13:17:22 -0500 Subject: [PATCH 3/6] Bump node version in AppVeyor CI The builds on AppVeyor have been failing. This should resolve the issue. See this PR for more detail: https://github.com/Automattic/simplenote-electron/pull/1842 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 383e2c20e..22a31f325 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ configuration: - AppX-Testing install: - - ps: Install-Product node 10 + - ps: Install-Product node 11.15.0 - cinst make - npm ci - patch -p1 < ./resources/macos/macPackager-patch.diff From c599b274424d4276714805c9207d3bb36839d8a2 Mon Sep 17 00:00:00 2001 From: Dennis Snell Date: Tue, 21 Jan 2020 15:42:28 -0700 Subject: [PATCH 4/6] Fix: Replace missing click handler in revision slider (#1837) (#1850) In paFIJd-8t it was reported that note corruption was occurring when viewing the history of one note when it gets updated remotely. Although this fix may or may not address that problem a code audit revealed that in #1792 I removed what appeared to be an unused function when it was in fact used by the component's `onClickOutside` wrapper. The missing handler function closed out of the revision slider when clicking anywhere else. Without it, the thread handling the click crashed but since it was a callback it didn't crash the app. A message appeared in the developer console indicating that the handler was missing. Because we haven't been closing the revision slider it has become possible to start editing a note while the revisions are still open, something prevented before by way of the click handler. Thus, if viewing a revision, clicking anywhere else, and continuing, then we fill the editor with what it thinks is a note (and not a revision) and then will respond to remote updates with the contents of that revision before accepting remote updates. (cherry picked from commit 43bc2a5ad279d43f817b056add67358ca0b41ee8) --- RELEASE-NOTES.txt | 1 + lib/revision-selector/index.tsx | 2 ++ 2 files changed, 3 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index eff79d75b..028568d86 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -19,6 +19,7 @@ - Fix ol numbering in markdown preview [#1823](https://github.com/Automattic/simplenote-electron/pull/1823) - Prevents weird effects in live previews due to incomplete input [#1822](https://github.com/Automattic/simplenote-electron/pull/1822) - Fixed a bug where searching for a tag containing non-alphanumeric characters erroneously returned no notes [#1828](https://github.com/Automattic/simplenote-electron/pull/1828) +- Properly close revision/history view when clicking outside of slider [#1837](https://github.com/Automattic/simplenote-electron/pull/1837) ### Other Changes diff --git a/lib/revision-selector/index.tsx b/lib/revision-selector/index.tsx index 9f550a091..857324bbd 100644 --- a/lib/revision-selector/index.tsx +++ b/lib/revision-selector/index.tsx @@ -71,6 +71,8 @@ export class RevisionSelector extends Component { } } + handleClickOutside = () => this.onCancelRevision(); + onAcceptRevision = () => { const { note, onUpdateContent, resetIsViewingRevisions } = this.props; const { revisions, selection } = this.state; From 2f932b3092fe92917e736b7d86667e8ff84d90eb Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Wed, 22 Jan 2020 09:29:25 +0100 Subject: [PATCH 5/6] Bump version to 1.14.0-beta.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index af89f6fc5..76a568929 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "simplenote", - "version": "1.14.0-beta.1", + "version": "1.14.0-beta.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 340628cbb..9d468746b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "email": "support@simplenote.com" }, "productName": "Simplenote", - "version": "1.14.0-beta.1", + "version": "1.14.0-beta.2", "main": "desktop/index.js", "license": "GPL-2.0", "homepage": "https://simplenote.com", From 1c27ef3bc9d47bbe3cff06559e764293e6ba9ae7 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Fri, 24 Jan 2020 16:20:50 +0100 Subject: [PATCH 6/6] Bump version to 1.14 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 76a568929..eee27c63a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "simplenote", - "version": "1.14.0-beta.2", + "version": "1.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9d468746b..e63c2f667 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "email": "support@simplenote.com" }, "productName": "Simplenote", - "version": "1.14.0-beta.2", + "version": "1.14.0", "main": "desktop/index.js", "license": "GPL-2.0", "homepage": "https://simplenote.com",