Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/brave/browser-laptop into…
Browse files Browse the repository at this point in the history
… fix-omnibar-update
stripedpajamas committed Jun 13, 2018
2 parents 267c2c3 + 80dbf88 commit 9bbb4e6
Showing 7 changed files with 3,650 additions and 3,663 deletions.
6 changes: 3 additions & 3 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
runtime = electron
target_arch = x64
brave_electron_version = 6.0.12
chromedriver_version = 2.36
target = v6.0.12
brave_electron_version = 7.0.6
chromedriver_version = 2.37
target = v7.0.6
disturl=https://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist/
build_from_source = true
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [0.22.810](https://github.com/brave/browser-laptop/releases/tag/v0.22.810dev)

- Added a new "too many requests have been used" overlay when accepting Payment grants. ([#14356](https://github.com/brave/browser-laptop/issues/14356))
- Fixed CAPTCHA not compatible with Windows scaling options (high-res screen support). ([#14361](https://github.com/brave/browser-laptop/issues/14361))
- Fixed HTTP links being added as HTTPS in the Payments table. ([#14283](https://github.com/brave/browser-laptop/issues/14283))
- Fixed certain situations where Brave becomes unresponsive when blocking large amounts of popups. ([#14261](https://github.com/brave/browser-laptop/issues/14261))
- Upgraded to muon 7.0.6. ([#14308](https://github.com/brave/browser-laptop/issues/14308))
- Upgraded to Chromium 67.0.3396.71. ([#14307](https://github.com/brave/browser-laptop/issues/14307))

## [0.22.727](https://github.com/brave/browser-laptop/releases/tag/v0.22.727dev)

- Added CAPTCHA verification when accepting Payment grants. ([#14188](https://github.com/brave/browser-laptop/issues/14188))
6 changes: 3 additions & 3 deletions app/filtering.js
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ function registerForBeforeRequest (session, partition) {
const firstPartyUrl = module.exports.getMainFrameUrl(details)
// this can happen if the tab is closed and the webContents is no longer available
if (!firstPartyUrl) {
muonCb({ cancel: true })
muonCb({})
return
}

@@ -332,7 +332,7 @@ function registerForBeforeSendHeaders (session, partition) {
const firstPartyUrl = module.exports.getMainFrameUrl(details)
// this can happen if the tab is closed and the webContents is no longer available
if (!firstPartyUrl) {
muonCb({ cancel: true })
muonCb({})
return
}

@@ -381,7 +381,7 @@ function registerForHeadersReceived (session, partition) {
const firstPartyUrl = module.exports.getMainFrameUrl(details)
// this can happen if the tab is closed and the webContents is no longer available
if (!firstPartyUrl) {
muonCb({ cancel: true })
muonCb({})
return
}

Loading

0 comments on commit 9bbb4e6

Please sign in to comment.