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

bump electron to 6.1.6, fixes missing window titles in accessibility apps #86837

Merged
merged 7 commits into from
Dec 14, 2019
Merged

bump electron to 6.1.6, fixes missing window titles in accessibility apps #86837

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a0ca9a6
bump electron to 6.1.6, fixes #84195 missing window titles in accessi…
Dec 12, 2019
d54d943
update electron version string in cgmanifest.json
Dec 12, 2019
e25f35c
Merge branch 'master' into fix-missing-window-titles
Dec 13, 2019
221e1d8
Merge branch 'master' into fix-missing-window-titles
Dec 13, 2019
54eb533
Merge branch 'master' into fix-missing-window-titles
deepak1556 Dec 13, 2019
c50f0e2
Merge branch 'master' into fix-missing-window-titles
deepak1556 Dec 13, 2019
e5966d1
Merge branch 'master' into fix-missing-window-titles
deepak1556 Dec 14, 2019
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
2 changes: 1 addition & 1 deletion .yarnrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
disturl "https://atom.io/download/electron"
target "6.1.5"
target "6.1.6"
runtime "electron"
4 changes: 2 additions & 2 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
"git": {
"name": "electron",
"repositoryUrl": "https://github.com/electron/electron",
"commitHash": "6f62f91822a80192cb711c604f1a8f1a176f328d"
"commitHash": "19c705ab80cd6fdccca3d65803ec2c4addb9540a"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the review on wrong line, the review ui is bad at commenting for unchanged line.

Need to bump the version a few lines below "version": "6.1.6"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, fixed in new commit

}
},
"isOnlyProductionDependency": true,
"license": "MIT",
"version": "6.1.5"
"version": "6.1.6"
},
{
"component": {
Expand Down
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 @@ -85,7 +85,7 @@
"coveralls": "^2.11.11",
"cson-parser": "^1.3.3",
"debounce": "^1.0.0",
"electron": "6.1.5",
"electron": "6.1.6",
"event-stream": "3.3.4",
"express": "^4.13.1",
"fancy-log": "^1.3.3",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2537,10 +2537,10 @@ electron-to-chromium@^1.2.7:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0=

electron@6.1.5:
version "6.1.5"
resolved "https://registry.yarnpkg.com/electron/-/electron-6.1.5.tgz#1f1bc54042587d8368edd43ffecb0ce7c84cab87"
integrity sha512-PrdJKkAS0IaSJwu4him03VYqvAKK1qyWTE/ieb4LgcbR4F4u90b91/7xna6P1GpD/FXiHqzZQcs0SvK/o08ckQ==
electron@6.1.6:
version "6.1.6"
resolved "https://registry.yarnpkg.com/electron/-/electron-6.1.6.tgz#d63ea9c89b85b981a29eb3088bf391bf52bd8d73"
integrity sha512-4c4GiFTbWY2Mgv20HB4Bfhf1hDKb0MWgC35wkwNepNom1ioWfumocPHZrSs1xNAEe+tOmezY6lq74n3LbwTnVQ==
dependencies:
"@types/node" "^10.12.18"
electron-download "^4.1.0"
Expand Down