Commit Graph
20272 Commits
Author SHA1 Message Date
Sergey 5bdae034f1 Merge pull request #8234 from brave/ipfs-page-indicator
Add custom badge to ipfs pages
2021-03-18 23:37:44 +03:00
Anton Lazarev d1d8bd4a9f Merge pull request #8290 from brave/adblock-rust-ffi-format
Fix lint errors in adblock-rust-ffi
2021-03-18 15:21:46 -04:00
brave-builds dfd868c0f4 1.24.6 2021-03-18 18:02:37 +00:00
spylogsster@gmail.com f6b3e1f5f2 Customized identificator for ipfs pages 2021-03-18 20:55:39 +03:00
Anton Lazarev 7433983969 address additional lint issues 2021-03-18 10:41:32 -07:00
Anton Lazarev 77e6b72778 apply clang-format to adblock-rust-ffi code 2021-03-18 10:39:09 -07:00
Stephen Donner d348be0836 Merge pull request #8164 from stephendonner/fix-13876
Add question mark to Rewards-tour slide; fixes issue #13876
2021-03-18 09:33:25 -07:00
Brian R. Bondy 534a1e122d Merge pull request #8257 from brave/ipfs-android
Add IPFS gateway support on Android
2021-03-18 12:01:39 -04:00
Terry Mancey 103be2b8c1 Merge pull request #8283 from brave/issues/14799
Fixes conversion date in the logs is always `0 hours 0 minutes 0 seconds`
2021-03-18 15:40:04 +00:00
Brian R. Bondy 9694c140d3 Merge pull request #8279 from brave/cname-adblock-doh
Only specify net::HostResolverSource::DNS when DoH is enabled
2021-03-18 10:24:06 -04:00
brave-builds c655edee75 1.24.5 2021-03-18 12:01:45 +00:00
Brian Clifton e3766f5fbf Merge pull request #8270 from brave/forbid-new-empty-cosmetic-filters
Forbid new empty cosmetic filters from being created via right click menu
2021-03-18 00:39:47 -07:00
Terry Mancey f819781644 Fixes conversion date in the logs is always 0 hours 0 minutes 0 seconds 2021-03-18 07:04:19 +00:00
Sergey 323b14fc4a Merge pull request #8254 from brave/ipfs-badge-public-gateways
Resolve ipfs links through x-ipfs-path and dnslink values
2021-03-18 09:14:33 +03:00
Anton Lazarev 54b258bcbf Forbid new empty cosmetic filters from being created via right click menu 2021-03-17 22:53:48 -07:00
brave-builds 437bb96a3a 1.24.4 2021-03-18 00:01:03 +00:00
Fanboynz ac95bd4684 Merge pull request #8242 from brave/ffix-insta
Fixes https://github.com/brave/brave-browser/issues/14289
2021-03-18 11:57:25 +13:00
Anthony Tseng 4537a79c55 Only specify net::HostResolverSource::DNS when DoH is enabled 2021-03-17 15:42:37 -07:00
Terry Mancey 2c2da5d93a Merge pull request #8280 from brave/issues/14794
Fix Brave Ads build error on Android for AdsServiceImpl::IsFullScreen
2021-03-17 22:28:11 +00:00
Terry Mancey 0e4a2e3e83 Fix Brave Ads build error on Android for AdsServiceImpl::IsFullScreen 2021-03-17 22:13:56 +00:00
Brian Johnson 7c3d5c90cb Merge pull request #8239 from brave/issues/14096
get cosmetic filtering rules when we get the url
2021-03-17 15:07:57 -07:00
bridiver 0106a2588b check for null observer 2021-03-17 13:19:05 -07:00
Brian Johnson 4c53e129a8 Merge pull request #8274 from brave/referral-dcheck
Fix referral test DCHECK and threading issues
2021-03-17 12:05:45 -07:00
brave-builds 6d56220a50 1.24.3 2021-03-17 18:01:48 +00:00
Brian R. Bondy 7f0bc31b89 Add IPFS gateway support on Android 2021-03-17 13:09:14 -04:00
Terry Mancey da80cbe2d6 Merge pull request #8271 from brave/issues/14761
Decouple AdsImpl::OnTextLoaded page transition type and user gesture
2021-03-17 15:47:27 +00:00
bridiver 24c8d4ae99 code review fixes 2021-03-17 08:44:53 -07:00
bridiver 1619cde7f8 fix unsafe threading issues 2021-03-17 08:44:09 -07:00
Max 2aa85afeef Merge pull request #8269 from brave/maxk-fix-rebase-l10n
Fixes brave_strings_override.grd to include a missing grdp override.
2021-03-17 10:29:39 -04:00
Terry Mancey 24930e8137 Merge pull request #8255 from brave/issues/14736
Fixes Brave Ads are not shown if the browser window did not enter the background and then become active
2021-03-17 12:41:24 +00:00
Terry Mancey c61b683a4e Merge pull request #8265 from brave/issues/14762
Decouple AdsServiceImpl full screen mode business logic
2021-03-17 12:27:12 +00:00
brave-builds 600ba3b5af 1.24.2 2021-03-17 12:00:56 +00:00
Terry Mancey 49574012db Decouple AdsImpl::OnTextLoaded page transition type and user gesture 2021-03-17 11:38:09 +00:00
AlexeyBarabash eb23e82fc0 Merge pull request #8264 from brave/fix_14760
Remove sync v1 extension leftover
2021-03-17 12:08:49 +02:00
Terry Mancey 47fff12a3c Fixes Brave Ads are not shown if the browser window did not enter the background and then become active 2021-03-17 08:12:49 +00:00
Terry Mancey d6ecdf8339 Decouple AdsServiceImpl full screen mode business logic 2021-03-17 08:11:00 +00:00
mkarolin b73bae3184 Fixes brave_strings_override.grd to include a missing grdp override.
Because brave_strings.grd and settings_brave_strings.grdp are special
cases in terms of naming, the rebase script wasn't adding the GRDP
override to the GRD override.

Addresses brave/brave-browser#14750

Doesn't fix the actual translations, but we should get them the next
time we order.
2021-03-16 20:12:25 -04:00
brave-builds c00cb7f4b2 1.24.1 2021-03-17 00:00:59 +00:00
bridiver 847319b09b fix DCHECK in stats updater tests 2021-03-16 15:28:22 -07:00
Stephen Donner ab4bf233fd Add question mark to Rewards-tour slide; fixes issue #13876 2021-03-16 15:15:11 -07:00
Anton Lazarev 1d1eea041e Merge pull request #8209 from brave/merge-adblock-rust-ffi
Merge adblock_rust_ffi into brave-core repo
2021-03-16 17:00:21 -04:00
brave-buildsandbrave-builds 99c3ff78c8 Update Nightly channel to: 1.24.0 (#8272)
Co-authored-by: brave-builds <devops@brave.com>
2021-03-16 20:08:31 +00:00
Brian Clifton 15569c6ebd Merge pull request #8261 from brave/ntp-customize-background-fix
NTP: Fix customize popup background via missing semi-colon to css
2021-03-16 11:25:47 -07:00
brave-builds c043f77c31 1.23.42 2021-03-16 18:01:13 +00:00
Sergey 0c30b09748 Merge pull request #8263 from brave/ipfs-public-gateway-conversion
Convert 127.0.0.1 to localhost for default ipfs gateways
2021-03-16 20:42:34 +03:00
bridiver 0c7258499e move instead of Clone 2021-03-16 09:57:54 -07:00
Anton Lazarev 9e2f14a874 Merge pull request #8262 from brave/cname-block-regression
Use cname url when blocking
2021-03-16 11:36:13 -04:00
AlexeyBarabash 2c16c4ca6c Remove sync v1 extension leftover
fixes brave/brave-browser#14760
2021-03-16 17:09:30 +02:00
Terry Mancey 27d8468d48 Merge pull request #8244 from brave/issues/14687
Refactor hardcoded catalog version to use a const
2021-03-16 14:49:28 +00:00
Wojciech Knapik 697587fb5b Merge pull request #8194 from brave/wknapik-dcheck
Enabled DCHECKs in tests that run on CI.
2021-03-16 14:47:38 +01:00