brave · luixxiul · Jul 3, 2017 · Jun 15, 2017 · Jun 15, 2017 · Jun 15, 2017
diff --git a/.gitignore b/.gitignore
@@ -70,3 +70,5 @@ httpse.leveldb
 
 # sync bundle file should be built and copied from the brave/sync repo for now
 app/extensions/brave/content/scripts/sync.js
+
+package-lock.json
diff --git a/.npmrc b/.npmrc
@@ -1,7 +1,7 @@
 runtime = electron
 target_arch = x64
-brave_electron_version = 3.0.202
-chromedriver_version = 2.27
-target = v3.0.202
+brave_electron_version = 4.2.6
+chromedriver_version = 2.29
+target = v4.2.6
 disturl=https://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist/
 build_from_source = true
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
   - "7"
 dist: trusty
 sudo: required
+group: edge
 before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
@@ -14,6 +15,7 @@ branches:
   only:
     - master
     - /\d+\.\d+\.x/
+    - navigationBar-aphrodite
 notifications:
   slack:
     secure: bDwO2uce5JAZvjrvWj4+/+yEXJAIK4O0RcgUWvZ2IMbi7Q9I89Mw40JmkLWL6x2gWZwxr8+FoLtErJA7RVrsfImjrX+NmMyAB7AydLdrBJtkLozNnuacnhcnBRyp1gGCa1ymxCEXGbgC6onAD3kiJJhggr70T+2lu3IuJYXENhc=

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,62 @@
 # Changelog
 
+## [0.17.13](https://github.com/brave/browser-laptop/releases/tag/v0.17.13dev)
+- Added Honey extension. ([#8118](https://github.com/brave/browser-laptop/issues/8118))
+- Added compact bravery panel option. ([#8954](https://github.com/brave/browser-laptop/issues/8954))
+- Added wide URL bar option. ([#8421](https://github.com/brave/browser-laptop/issues/8421))
+- Added support for Linux Mint - Serena. ([#9590](https://github.com/brave/browser-laptop/issues/9590))
+- Added a new "Welcome" screen. ([#7821](https://github.com/brave/browser-laptop/issues/7821))
+- Fixed saving a document doesn't show correct origin. ([#8698](https://github.com/brave/browser-laptop/issues/8698))
+- Fixed CSP referrer errors. ([#8920](https://github.com/brave/browser-laptop/issues/8920))
+- Fixed NoScript approvals from private tabs apply to regular tabs. ([#8779](https://github.com/brave/browser-laptop/issues/8779))
+- Fixed incorrect hostname shown in titlemode when host is very long. ([#9500](https://github.com/brave/browser-laptop/issues/9500))
+- Fixed Brave Browser very slow to open or close tabs. ([#4848](https://github.com/brave/browser-laptop/issues/4848))
+- Fixed 50-80ms delay when closing a tab. ([#7395](https://github.com/brave/browser-laptop/issues/7395))
+- Fixed browser performance reduces when large amount of bookmarks are imported. ([#7240](https://github.com/brave/browser-laptop/issues/7240))
+- Fixed slow navigation after importing a lot of bookmarks. ([#9427](https://github.com/brave/browser-laptop/issues/9427))
+- Fixed importing bookmarks after sync causes loss of hierarchy. ([#8892](https://github.com/brave/browser-laptop/issues/8892))
+- Fixed import data gets duplicated after sync. ([#8508](https://github.com/brave/browser-laptop/issues/8508))
+- Fixed CSS for visited links ( A:Visited ). ([#512](https://github.com/brave/browser-laptop/issues/512))
+- Fixed download leaves about:blank page loading. ([#9620](https://github.com/brave/browser-laptop/issues/9620))
+- Fixed middle click is not working on Home button. ([#9562](https://github.com/brave/browser-laptop/issues/9562))
+- Fixed closing the only tab in second tabset showing the wrong number of tabs. ([#9561](https://github.com/brave/browser-laptop/issues/9561))
+- Fixed switching tabs while reloading windows from last time . ([#9502](https://github.com/brave/browser-laptop/issues/9502))
+- Fixed middle click on pinned tab causes all opened tabs to show as pinned tabs. ([#9492](https://github.com/brave/browser-laptop/issues/9492))
+- Fixed tab title isn't hidden for session tabs after the tab threshold is reached. ([#9466](https://github.com/brave/browser-laptop/issues/9466))
+- Fixed "Select its parent tab" setting not working as expected. ([#9395](https://github.com/brave/browser-laptop/issues/9395))
+- Fixed closing tabs results in white page. ([#9306](https://github.com/brave/browser-laptop/issues/9306))
+- Fixed bookmark title is not selected automatically. ([#9091](https://github.com/brave/browser-laptop/issues/9091))
+- Fixed improve RPM packaging. ([#9074](https://github.com/brave/browser-laptop/issues/9074))
+- Fixed button not disabled on add new bookmark modal by default. ([#9019](https://github.com/brave/browser-laptop/issues/9019))
+- Fixed show all button overlaps on ledger table entry. ([#8869](https://github.com/brave/browser-laptop/issues/8869))
+- Fixed pinned tab notification doesn't have the caret and shown across all tabs. ([#8626](https://github.com/brave/browser-laptop/issues/8626))
+- Fixed viewing HBO GO video. ([#8581](https://github.com/brave/browser-laptop/issues/8581))
+- Fixed Allow notification bar choices. ([#8826](https://github.com/brave/browser-laptop/issues/8826))
+- Fixed tab preview on hover. ([#7606](https://github.com/brave/browser-laptop/issues/7606))
+- Fixed right clicking tab being previewed causes focus to change. ([#7327](https://github.com/brave/browser-laptop/issues/7327))
+- Fixed clicking on disabled Ad/Tracker count enables the `<li>` element under braveryPanelBody. ([#7026](https://github.com/brave/browser-laptop/issues/7026))
+- Fixed autofill form option blinks and cannot be clicked. ([#5438](https://github.com/brave/browser-laptop/issues/5438))
+- Fixed build hangs in tmux on macOS. ([#8916](https://github.com/brave/browser-laptop/issues/8916))
+- Upgrade Muon to 4.1.7. ([#9645](https://github.com/brave/browser-laptop/issues/9645))
+- Upgrade Chromium to 59.0.3071.109. ([#9626](https://github.com/brave/browser-laptop/issues/9626))
+
+## [0.16.9](https://github.com/brave/browser-laptop/releases/tag/v0.16.9dev)
+- Fixed crash on login or other input. ([#9369](https://github.com/brave/browser-laptop/issues/9369))
+- Fixed ability to scroll down to latest bookmark. ([#9055](https://github.com/brave/browser-laptop/issues/9055))
+
+## [0.16.5](https://github.com/brave/browser-laptop/releases/v0.16.5dev)
+ - Added various performance improvements. ([#9342](https://github.com/brave/browser-laptop/issues/9342))
+ - Disabled the “Fund with debit/credit card” button in preparation for new funding method. ([#9327](https://github.com/brave/browser-laptop/issues/9327))
+ - Fixed custom bookmark titles not being searched for suggestions. ([#9249](https://github.com/brave/browser-laptop/issues/9249))
+ - Fixed pause is not working correctly for downloads. ([#9244](https://github.com/brave/browser-laptop/issues/9244))
+ - Fixed pinned tab showing blank white page when relaunching the browser. ([#9134](https://github.com/brave/browser-laptop/issues/9134))
+ - Fixed view log shows console errors when checking for update. ([#9122](https://github.com/brave/browser-laptop/issues/9122))
+ - Fixed cannot move bookmarks/folders to other folders in Bookmark Manager. ([#9101](https://github.com/brave/browser-laptop/issues/9101))
+ - Fixed bookmarks manager scrolling on drag and drop into folders. ([#8946](https://github.com/brave/browser-laptop/issues/8946))
+ - Fixed sync not tracking & merging changes in some cases. ([#8454](https://github.com/brave/browser-laptop/issues/8454))
+ - Upgrade to Chromium 59.0.3071.86. ([#9012](https://github.com/brave/browser-laptop/issues/9012))
+ - Upgrade to Muon 4.0.1. ([#9256](https://github.com/brave/browser-laptop/issues/9256))
+
 ## [0.15.314](https://github.com/brave/browser-laptop/releases/v0.15.314dev)
  - Fixed 'autocomplete search term' results are not filtering out 'http...' results. ([#9141](https://github.com/brave/browser-laptop/issues/9141))
  - Fixed WebView Not Visible in Popup Window. ([#9095](https://github.com/brave/browser-laptop/issues/9095))

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,5 +1,26 @@
-Mozilla Public License Version 2.0
-==================================
+LICENSES FOR INCORPORATED CODEBASES
+===================================
+
+Incorporating code from Privacy Badger Chrome,
+https://github.com/EFForg/privacybadger
+Copyright © 2015 Electronic Frontier Foundation and other contributors
+Licensed GPL v3
+
+Incorporating code from HTTPS Everywhere,
+Copyright © 2010-2017 Electronic Frontier Foundation and others
+Licensed GPL v2+
+
+Incorporating code from Chameleon,
+https://github.com/ghostwords/chameleon
+Copyright © 2015 ghostwords
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
+Alternatively, this code may be distributed or
+otherwise used under the terms of GPL v3
+
+Text of Mozilla Public License Version 2.0
+==========================================
 
 1. Definitions
 --------------

diff --git a/README.md b/README.md
@@ -29,9 +29,11 @@ Brave supports 3 [release channels](https://github.com/brave/browser-laptop/wiki
 
 ## Community
 
-[Join the community](https://community.brave.com/) if you'd like to get more involved with Brave. You can [ask for help](https://community.brave.com/c/help-me),
+[Join the Q&A community](https://community.brave.com/) if you'd like to get more involved with Brave. You can [ask for help](https://community.brave.com/c/help-me),
 [discuss features you'd like to see](https://community.brave.com/c/feature-requests), and a lot more. We'd love to have your help so that we can continue improving Brave.
 
+Join our [Discord community chat](https://discordapp.com/invite/k57tYrS) for higher bandwidth discussions.
+
 ## Useful documentation
 
 * See [CONTRIBUTING.md](.github/CONTRIBUTING.md) for tips and guidelines about contributing.
@@ -49,15 +51,11 @@ For other platforms (macOS, Linux) You'll need certain packages installed before
 
 ### Prerequisites
 
-1. `nodejs` **`>= 6.1`**
+1. `nodejs` **`>= 7.9.0`**
 
     Install from your package manager or download from https://nodejs.org
 
-2. `node-gyp` **`3.3.1`**
-
-        sudo npm install -g node-gyp@3.3.1
-
-#### On Debian/Ubuntu
+#### On Debian / Ubuntu /Mint
 
 ````
 apt-get install libgnome-keyring-dev build-essential rpm ninja-build
@@ -89,12 +87,10 @@ After installing the prerequisites:
 
         cd browser-laptop
 
-3. Install the Node (v5+) dependencies:
+3. Install the Node dependencies:
 
         npm install
 
-If this fails on Linux with an error related to `ad-block`, try updating to Node 6.1 and `node-gyp` 3.3.1 (see discussion at https://github.com/brave/browser-laptop/issues/214)
-
 Instead of `npm install` you may also install with [yarn](https://github.com/yarnpkg/yarn).
 
 ### Troubleshooting

diff --git a/app/autofill.js b/app/autofill.js
@@ -5,39 +5,40 @@
 const electron = require('electron')
 const session = electron.session
 const appActions = require('../js/actions/appActions')
+const messages = require('../js/constants/messages')
 
 module.exports.init = () => {
   process.on('personal-data-changed', (profileGuids, creditCardGuids) => {
     appActions.autofillDataChanged(profileGuids, creditCardGuids)
   })
 }
 
-module.exports.addAutofillAddress = (detail, guid) => {
+module.exports.addAutofillAddress = (detail) => {
   session.defaultSession.autofill.addProfile({
-    full_name: detail.name,
-    company_name: detail.organization,
-    street_address: detail.streetAddress,
-    city: detail.city,
-    state: detail.state,
-    postal_code: detail.postalCode,
-    country_code: detail.country,
-    phone: detail.phone,
-    email: detail.email,
-    guid: guid
+    full_name: detail.get('name'),
+    company_name: detail.get('organization'),
+    street_address: detail.get('streetAddress'),
+    city: detail.get('city'),
+    state: detail.get('state'),
+    postal_code: detail.get('postalCode'),
+    country_code: detail.get('country'),
+    phone: detail.get('phone'),
+    email: detail.get('email'),
+    guid: detail.get('guid')
   })
 }
 
 module.exports.removeAutofillAddress = (guid) => {
   session.defaultSession.autofill.removeProfile(guid)
 }
 
-module.exports.addAutofillCreditCard = (detail, guid) => {
+module.exports.addAutofillCreditCard = (detail) => {
   session.defaultSession.autofill.addCreditCard({
-    name: detail.name,
-    card_number: detail.card,
-    expiration_month: detail.month,
-    expiration_year: detail.year,
-    guid: guid
+    name: detail.get('name'),
+    card_number: detail.get('card'),
+    expiration_month: detail.get('month'),
+    expiration_year: detail.get('year'),
+    guid: detail.get('guid')
   })
 }
 
@@ -68,3 +69,19 @@ module.exports.removeLogin = (form) => {
 module.exports.clearLogins = (form) => {
   session.defaultSession.autofill.clearLogins(form)
 }
+
+module.exports.getAutofillableLogins = (tab) => {
+  session.defaultSession.autofill.getAutofillableLogins((result) => {
+    if (tab && !tab.isDestroyed()) {
+      tab.send(messages.PASSWORD_DETAILS_UPDATED, result)
+    }
+  })
+}
+
+module.exports.getBlackedlistLogins = (tab) => {
+  session.defaultSession.autofill.getBlackedlistLogins((result) => {
+    if (tab && !tab.isDestroyed()) {
+      tab.send(messages.PASSWORD_SITE_DETAILS_UPDATED, result)
+    }
+  })
+}
diff --git a/app/browser/bookmarksExporter.js b/app/browser/bookmarksExporter.js
@@ -52,7 +52,7 @@ function createBookmarkArray (sites, parentFolderId, first = true, depth = 1) {
 
   if (first) payload.push(`${indentFirst}<DL><p>`)
 
-  filteredBookmarks.toList().sort(siteUtil.siteSort).forEach((site) => {
+  filteredBookmarks.forEach((site) => {
     if (site.get('tags').includes(siteTags.BOOKMARK) && site.get('location')) {
       title = site.get('customTitle') || site.get('title') || site.get('location')
       payload.push(`${indentNext}<DT><A HREF="${site.get('location')}">${title}</A>`)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -70,3 +70,5 @@ httpse.leveldb

		# sync bundle file should be built and copied from the brave/sync repo for now
		app/extensions/brave/content/scripts/sync.js

		package-lock.json
Copy link Contributor Author luixxiul Jun 12, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. TODO: drop the commit to remove this.