Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/1.14 into develop. #1865

Merged
merged 6 commits into from
Jan 27, 2020
Merged

Merge release/1.14 into develop. #1865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe47449
Bump version to 1.14.0-beta.1
loremattei Jan 13, 2020
2111560
Cycle the token (#1846)
belcherj Jan 17, 2020
5711630
Bump node version in AppVeyor CI
belcherj Jan 20, 2020
c599b27
Fix: Replace missing click handler in revision slider (#1837) (#1850)
dmsnell Jan 21, 2020
2f932b3
Bump version to 1.14.0-beta.2
loremattei Jan 22, 2020
1c27ef3
Bump version to 1.14
loremattei Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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'))
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
2 changes: 2 additions & 0 deletions lib/revision-selector/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ export class RevisionSelector extends Component<Props, State> {
}
}

handleClickOutside = () => this.onCancelRevision();

onAcceptRevision = () => {
const { note, onUpdateContent, resetIsViewingRevisions } = this.props;
const { revisions, selection } = this.state;
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"email": "[email protected]"
},
"productName": "Simplenote",
"version": "1.12.0",
"version": "1.14.0",
"main": "desktop/index.js",
"license": "GPL-2.0",
"homepage": "https://simplenote.com",
Expand Down