Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
730 Commits 1 Branch 0 Tags
f2cac13bcf48ec00e3d7185276431bb08bb9b8e5
Commit Graph
730 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Garrett Robinson f2cac13bcf Import history, bookmarks, cookies, and passwords from Brave 2018-07-05 16:20:30 -07:00
Anthony Tseng 96ef43f327 Merge pull request #223 from brave/fix_build_fail 
linux_channel_name should be included only for linux
 2018-07-05 15:40:20 -07:00
Simon Hong 57b983b2c8 linux_channel_name should be included only for linux 2018-07-06 07:35:51 +09:00
Simon Hong 6cd4cdf2d9 Merge pull request #205 from brave/app_icon_linux 
Linux support
 2018-07-06 06:58:09 +09:00
Brian R. Bondy 4f6afa80cb Merge pull request #186 from brave/welcome/webui 
Add about:welcome, add about:adblock, refactor about:payments WebUI
 2018-07-05 16:37:10 -04:00
Simon Hong a65617bb9e Unify linux channel string info to brave/build/linux/channels.gni 
Define channel in brave/build/linux/BUILD.gn and use it in C++ world.
 2018-07-06 04:58:48 +09:00
Brian R. Bondy 4ceb6ac4ed Merge pull request #217 from brave/yarn-to-npm 
add package-lock.json
 2018-07-05 15:34:22 -04:00
Brian R. Bondy 7d27486e36 Setup about:adblock redux and populate with some basic data 
Fix https://github.com/brave/brave-browser/issues/267
 2018-07-05 14:56:40 -04:00
Brian R. Bondy c708b7f7a3 Merge pull request #219 from brave/include_scaled_resources_to_mini_installer_archive 
Include brave_[100|200]_percent.pak in mini_installer
 2018-07-05 13:42:34 -04:00
Brian R. Bondy ad1979a751 Merge pull request #218 from brave/linux_install_package 
Include brave_[100|200]_percent.pak to linux install package
 2018-07-05 13:42:24 -04:00
Brian R. Bondy 3fa9eb3891 Harden regional ad block language matching 
Fix https://github.com/brave/brave-browser/issues/485
 2018-07-05 10:15:40 -04:00
Brian R. Bondy 59927ea8fc Add test to make sure custom WebUI pages load 2018-07-05 10:15:39 -04:00
Brian R. Bondy 8583bdb402 Remove IsWebUIAllowedToMakeNetworkRequests exception for brave.com 
Related to: https://github.com/brave/brave-browser/issues/315
 2018-07-05 10:15:39 -04:00
Brian R. Bondy 038c4b61d4 Add dep to grd to fix header changes not updating 
Partially implements https://github.com/brave/brave-browser/issues/267
 2018-07-05 10:15:39 -04:00
Brian R. Bondy 7d47f655f4 Add chrome://adblock page 2018-07-05 10:15:39 -04:00
Brian R. Bondy 504adc4fae Refactor and rename Brave Payments 2018-07-05 10:15:39 -04:00
Brian R. Bondy 76527c70f3 Subclass BasicUI for chrome://welcome page 2018-07-05 10:15:39 -04:00
Brian R. Bondy c860958a4e Refactor new-tab WebUI 
BasicUI had some things only specific to the new-tab in it.
This change makes it so the custom things for NewTabUI are in the NewTab
page and makes it easier for future things to subclass BasicUI
 2018-07-05 10:15:38 -04:00
Cezar Augusto 76c6f39f4a add about:welcome and webui handler 
-
adds basic UI handler for welcome page without usable UI
while design finish the new spec for the page
-
address https://github.com/brave/brave-browser/issues/276
test plan: npm run test -- brave_browser_tests --filter=BraveWelcomeUIBrowserTest.*
 2018-07-05 10:15:38 -04:00
Simon Hong 980fda86ce Support nightly channel on Linux 2018-07-05 13:57:32 +09:00
Simon Hong 404c84ab14 Add browser test for BraveViewsDelegateLinux 
BraveViewsDelegateLinuxBrowserTest.GetDefaultWindowIconTest checks
whether proper image is returned from ViewsDelegate::GetDefaultWindowIcon()
 2018-07-05 13:57:32 +09:00
Simon Hong 1b715fdcd3 Use brave's icon for development build 2018-07-05 13:57:32 +09:00
Simon Hong d5d529ca20 Introduce BraveViewsDelegateLInux and BraveBrowserMainExtraPartsViewsLinux 
They are subclass of ChromeViewsDelegate and
ChromeBrowserMainExtraPartsViewsLinux.
They are introduced to override ChromeViewsDelegate::GetWindowIcon() in
chrome_views_delegate_linux.cc.
 2018-07-05 13:57:32 +09:00
Simon Hong e0be092dcf Copying channel_info_posix.cc to unify channel logic in one place 
Channel determining logic is unified to brave::GetChannelImpl().
 2018-07-05 13:57:32 +09:00
Simon Hong 8ed6d4cacb Override GetDefaultUserDataDirectory() in chrome_paths_linux.cc 2018-07-05 13:57:32 +09:00
Simon Hong 02c7b18503 Cleanup channel info code in linux and add some tests 
Set parest user dir - .../BraveSoftware/Brave-Browser/...
Added unit test - BraveChannelInfoTest
 2018-07-05 13:57:32 +09:00
Simon Hong e791ca3f21 Apply brave's beta and dev app icon in official build 2018-07-05 13:57:32 +09:00
Brian R. Bondy 19848730b7 Merge pull request #113 from brave/safebrowsing_fix 
Moving safe browsing config to //brave/browser/safebrowsing
 2018-07-04 08:43:47 -04:00
Simon Hong 23bcc8f39e Include brave_[100|200]_percent.pak in mini_installer 2018-07-04 15:38:46 +09:00
Simon Hong b81c742e79 Include brave_[100|200]_percent.pak to linux install package 2018-07-04 12:39:07 +09:00
Cezar Augusto 0643dfa941 add package-lock.json 2018-07-04 00:02:50 -03:00
Anthony Tseng 1ceab77866 Merge pull request #216 from brave/block_script 
Report blocked script only when it is actually blocked
 2018-07-03 16:58:02 -07:00
Anthony Tseng dfb87860e8 Report blocked script only when it is actually blocked so we can filter 
out problem like https://github.com/brave/muon/pull/627
which `ContentSettingsObserver::AllowScriptFromSource` informs us
all the resources not just scripts

Auditors: @bridiver, @bbondy
 2018-07-03 16:30:10 -07:00
Brian R. Bondy eab720c53b Merge pull request #208 from brave/apply_channel_to_mac_app_name 
Apply channel name to mac app name
 2018-07-03 14:42:34 -04:00
Brian R. Bondy 074744b91c Merge pull request #209 from brave/create_dist_only_for_passed_channel 
Only creates dist package for specified channel on linux
 2018-07-03 14:37:16 -04:00
Jocelyn Liu 2dbbfc935c Merge pull request #212 from brave/branding_settings_history 
Branding in settings and history pages
 2018-07-03 08:51:22 -07:00
Simon Hong 0b780bff53 Move linux channel mapping logic to //brave/build/config.gni 2018-07-03 14:28:08 +09:00
Simon Hong 4787658676 Build app name in //brave/build/config.gni for sharing 
And use it in //brave/build/mac/BUILD.gn for applying channel to app and dmg
name.
 2018-07-03 12:51:39 +09:00
Simon Hong 7380f00a06 Apply channel info to dmg name 
Ex)Brave-Browser-Dev.dmg for dev channel dist build.
 2018-07-03 12:33:31 +09:00
Simon Hong 8b5be3e31d Apply channel name to mac app name 
Ex, beta channel -> Brave-Browser-Beta.app
 2018-07-03 12:33:31 +09:00
Simon Hong 98e9688c7c Merge pull request #213 from brave/fix_crash 
Fix app is quitted right after executing installed app
 2018-07-03 12:31:39 +09:00
Simon Hong bb991b23e0 Use CrProductDirName for fetching default user dir on MacOS 
In brave/build/config.gni brave_product_dir_name is made and it is
passed to tweak_info_plist.py
So, we don't need to modify chrome_paths_mac.mm anymore.
 2018-07-03 12:14:19 +09:00
Simon Hong 08ddb80786 Merge pull request #214 from brave/make_window_silent_installer_work 
Make mini installer for non-stable channel work properly
 2018-07-03 10:44:38 +09:00
Jocelyn Liu 963e99990e Merge pull request #215 from brave/remove_webstore_url 
Remove chrome web store URL for extensions
 2018-07-02 16:35:18 -07:00
Simon Hong 256f5aa8e7 Make mini installer for non-stable channel work properly 
It was not installed properly because needed string was empty.
 2018-07-03 08:21:29 +09:00
Jocelyn Liu 4a7f2f64a1 return empty webstore URL for extensions 2018-07-02 16:12:46 -07:00
Simon Hong 4a6216ad6e Fix app is quitted right after executing installed app 
local string's buffer is used after it is freed.
 2018-07-02 21:12:19 +09:00
Jocelyn Liu fc76973dd8 Add browser_resources.grd generated by l10nUtil.js 2018-07-01 10:49:04 -07:00
Jocelyn Liu 091d23acaf hide syncedTabs href in chrome://history and sign in disabled by device admin message in people page 2018-06-30 22:04:16 -07:00
Jocelyn Liu 45c8a93e44 add brave_page_visibility.js 2018-06-30 21:15:59 -07:00