brave · diracdeltas · Dec 23, 2016 · Jan 16, 2017 · Dec 6, 2016 · Dec 21, 2016
diff --git a/.gitignore b/.gitignore
@@ -67,3 +67,6 @@ httpse.leveldb
 
 # webstrom
 .idea
+
+# sync bundle file should be built and copied from the brave/sync repo for now
+app/extensions/brave/content/scripts/sync.js
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 script:
-  - npm run lint && npm test
+  - npm run lint && npm run download-sync-client && npm test
 notifications:
   slack:
     secure: bDwO2uce5JAZvjrvWj4+/+yEXJAIK4O0RcgUWvZ2IMbi7Q9I89Mw40JmkLWL6x2gWZwxr8+FoLtErJA7RVrsfImjrX+NmMyAB7AydLdrBJtkLozNnuacnhcnBRyp1gGCa1ymxCEXGbgC6onAD3kiJJhggr70T+2lu3IuJYXENhc=

diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -316,7 +316,7 @@ const createHistorySubmenu = () => {
       label: locale.translation('clearBrowsingData'),
       accelerator: 'Shift+CmdOrCtrl+Delete',
       click: function (item, focusedWindow) {
-        CommonMenu.sendToFocusedWindow(focusedWindow, [messages.SHORTCUT_OPEN_CLEAR_BROWSING_DATA_PANEL, {browserHistory: true}])
+        CommonMenu.sendToFocusedWindow(focusedWindow, [messages.SHORTCUT_OPEN_CLEAR_BROWSING_DATA_PANEL])
       }
     }
   ]
@@ -426,7 +426,6 @@ const createWindowSubmenu = () => {
 
 const createHelpSubmenu = () => {
   const submenu = [
-    CommonMenu.reportAnIssueMenuItem(),
     CommonMenu.separatorMenuItem,
     CommonMenu.submitFeedbackMenuItem(),
     {

diff --git a/app/cmdLine.js b/app/cmdLine.js
@@ -114,6 +114,7 @@ app.on('will-finish-launching', () => {
   // User clicked on a file or dragged a file to the dock on macOS
   app.on('open-file', (event, path) => {
     event.preventDefault()
+    path = encodeURI(path)
     if (!focusOrOpenWindow(path)) {
       newWindowURL = path
     }

diff --git a/app/common/commonMenu.js b/app/common/commonMenu.js
@@ -249,16 +249,6 @@ module.exports.importBrowserDataMenuItem = () => {
   }
 }
 
-module.exports.reportAnIssueMenuItem = () => {
-  return {
-    label: locale.translation('reportAnIssue'),
-    click: function (item, focusedWindow) {
-      module.exports.sendToFocusedWindow(focusedWindow,
-                                         [messages.SHORTCUT_NEW_FRAME, communityURL])
-    }
-  }
-}
-
 module.exports.submitFeedbackMenuItem = () => {
   return {
     label: locale.translation('submitFeedback'),

diff --git a/app/common/constants/settingsEnums.js b/app/common/constants/settingsEnums.js
@@ -21,8 +21,16 @@ const bookmarksToolbarMode = {
   FAVICONS_ONLY: 'faviconsOnly'
 }
 
+const tabCloseAction = {
+  LAST_ACTIVE: 'lastActive',
+  NEXT: 'next',
+  FIRST: 'first',
+  PARENT: 'parent'
+}
+
 module.exports = {
   startsWithOption,
   newTabMode,
-  bookmarksToolbarMode
+  bookmarksToolbarMode,
+  tabCloseAction
 }
diff --git a/app/common/state/aboutNewTabState.js b/app/common/state/aboutNewTabState.js
@@ -68,6 +68,7 @@ const getTopSites = (state) => {
   // remove folders; sort by visit count; enforce a max limit
   const sites = (state.get('sites') || new Immutable.List())
     .filter((site) => !siteUtil.isFolder(site))
+    .filter((site) => !siteUtil.isImportedBookmark(site))
     .filter((site) => !isSourceAboutUrl(site.get('location')))
     .sort(sortCountDescending)
     .slice(0, aboutNewTabMaxEntries)

diff --git a/app/extensions.js b/app/extensions.js
@@ -35,8 +35,7 @@ let generateBraveManifest = () => {
     manifest_version: 2,
     version: '1.0',
     background: {
-      scripts: [ 'content/scripts/idleHandler.js' ],
-      persistent: false
+      scripts: [ 'content/scripts/idleHandler.js', 'content/scripts/sync.js' ]
     },
     content_scripts: [
       {
@@ -148,7 +147,11 @@ let generateBraveManifest = () => {
     // allow access to webpack dev server resources
     let devServer = 'localhost:' + process.env.npm_package_config_port
     cspDirectives['default-src'] = '\'self\' http://' + devServer
-    cspDirectives['connect-src'] = '\'self\' http://' + devServer + ' ws://' + devServer
+    cspDirectives['connect-src'] = ['\'self\'',
+      'http://' + devServer,
+      'ws://' + devServer,
+      appConfig.sync.serverUrl,
+      appConfig.sync.s3Url].join(' ')
     cspDirectives['style-src'] = '\'self\' \'unsafe-inline\' http://' + devServer
   }
 

diff --git a/app/extensions/brave/img/caret_down_grey.svg b/app/extensions/brave/img/caret_down_grey.svg
diff --git a/app/extensions/brave/locales/bn-BD/menu.properties b/app/extensions/brave/locales/bn-BD/menu.properties
@@ -87,7 +87,6 @@ preferences=পছন্দসমূহ
 settings=সেটিংস সমূহ...
 bookmarksManager=ম্যানেজার বুকমার্ক করুন...
 importBrowserData=ব্রাউজার ডেটা ইম্পোর্ট করুন
-reportAnIssue=অভিযোগ জানান
 submitFeedback=প্রতিক্রিয়া দাখিল  করুন 
 bookmarksToolbar=বুকমার্ক টুলবার
 bravery=Shields

diff --git a/app/extensions/brave/locales/bn-IN/menu.properties b/app/extensions/brave/locales/bn-IN/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferences…
 settings=Settings…
 bookmarksManager=Bookmarks Manager…
 importBrowserData=Import Browser Data…
-reportAnIssue=ত্রুটির খবর দিন
 submitFeedback=Submit Feedback…
 bookmarksToolbar=বুকমার্ক জন্ত্রপট
 bravery=Shields

diff --git a/app/extensions/brave/locales/cs/menu.properties b/app/extensions/brave/locales/cs/menu.properties
@@ -87,7 +87,6 @@ preferences=Nastavení...
 settings=Nastavení...
 bookmarksManager=Správce záložek...
 importBrowserData=Zavést data prohlížeče...
-reportAnIssue=Hlásit potíže
 submitFeedback=Odeslat zpětnou vazbu...
 bookmarksToolbar=Nástrojový panel záložek
 bravery=Štíty

diff --git a/app/extensions/brave/locales/de-DE/menu.properties b/app/extensions/brave/locales/de-DE/menu.properties
@@ -87,7 +87,6 @@ preferences=Einstellungen...
 settings=Einstellungen...
 bookmarksManager=Lesezeichen verwalten...
 importBrowserData=Browser-Daten importieren…
-reportAnIssue=Problem melden
 submitFeedback=Feedback senden...
 bookmarksToolbar=Lesezeichen-Symbolleiste
 bravery=Schutz

diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties
@@ -55,6 +55,8 @@ reloadButton.title=Reload page
 homeButton.title=Open Homepage
 stopButton.title=Stop loading
 noScriptButton.title=Allow scripts
+enablePublisher.title=Enable publisher for payments
+disablePublisher.title=Disable publisher for payments
 braveMenu.title=Open Brave Shields Panel
 muteTab=Mute tab
 unmuteTab=Unmute tab
@@ -185,6 +187,7 @@ notificationPaymentDone=Your contribution of {{amount}} {{currency}} has been pr
 notificationTryPayments=Are you ready to support the sites you use most?
 notificationTryPaymentsYes=Sure, I'll try
 prefsRestart=Do you want to restart now?
+prefsRestartSync=Sync will start the next time Brave starts up. Restart now?
 yes=Yes
 no=No
 noThanks=No thanks

diff --git a/app/extensions/brave/locales/en-US/menu.properties b/app/extensions/brave/locales/en-US/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferences…
 settings=Settings…
 bookmarksManager=Bookmarks Manager…
 importBrowserData=Import Browser Data…
-reportAnIssue=Report an Issue
 submitFeedback=Submit Feedback…
 bookmarksToolbar=Bookmarks Toolbar
 bravery=Shields

diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -21,10 +21,33 @@ paymentsWelcomeText5=Note: Brave Payments uses a country-lookup service in order
 paymentsWelcomeText6=Need more info?
 paymentsWelcomeText7=for Brave Payments…
 paymentsWelcomeLink=View the FAQ
+paymentsFAQLink.title=View the FAQ
 paymentsSidebarText1=Our Partners
 paymentsSidebarText2=All transaction IP addresses are anonymized with technology from:
 paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
 paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
+syncTitle=Brave Sync
+syncTitleMessage=Sync encrypted browser data between your devices securely and privately using Brave Sync.
+syncEnable=Sync this device
+syncData=Sync Data
+syncDataMessage=Sync the following data from this device:
+syncBookmarks=Bookmarks
+syncHistory=Browsing history
+syncSiteSettings=Saved site settings
+syncNewDevice=Sync a new device...
+syncStart=I am new to sync
+syncAdd=I have an existing sync code
+syncRestartNeeded=Please restart to finish sync setup!
+syncNewDevice1=Open Brave on your new device and go to Preferences > Sync > 'I have an existing synced device'.
+syncNewDevice2=If it asks you to scan a QR code, click the button below and point your camera at the QR code.
+syncShowQR=Show secret QR code. (Do not share!)
+syncHideQR=Hide QR code
+syncNewDevice3=If asks you to enter code words, type in the words below.
+syncShowPassphrase=Show secret code words. (Do not share!)
+syncHidePassphrase=Hide code words
+syncDeviceName=Enter an optional name for this device:
+syncCreate=Set up sync
+syncEnterPassphrase=Enter your sync code words:
 accountBalance=account balance
 accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=loading…
@@ -42,15 +65,16 @@ insufficientFundsStatus=Your account balance is under your budget for this month
 defaultWalletStatus=Thanks for helping support your favorite websites!
 tableEmptyText=No table data.
 notificationEmptyText=Top publisher visits
-syncEmptyText=Sync settings coming soon.
 bitcoin=Bitcoin
 bitcoinAdd=Use your existing Bitcoin wallet/account
 bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave wallet.
 bitcoinBuy=Buy Bitcoin
+noPaymentHistory=Your first payment contribution will be {{reconcileDate}}
 viewPaymentHistory=View Payment History…
 paymentHistoryTitle=Your Payment History
 paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}.
 paymentHistoryOKText=OK
+hideExcluded=Only show included sites
 bravePayments=Brave Payments
 beta=beta
 contributionDate=Contribution Date
@@ -83,6 +107,7 @@ off=off
 on=on
 ok=Ok
 minimumPercentage=Hide sites with less than 1% usage
+autoSuggestSites=auto-include sites
 notifications=Show notifications
 moneyAdd=Use your debit/credit card
 moneyAddSubTitle=No Bitcoin needed!
@@ -112,6 +137,7 @@ views=Views
 timeSpent=Time Spent
 include=Include
 percentage=%
+remove=Remove
 bravery=Bravery
 hintsTitle=Helpful hints
 hint0=The site shields panel allows you to turn HTTPS Everywhere on or off. HTTPS Everywhere automatically changes your HTTP traffic to HTTPS for supported sites to keep you more secure.
@@ -122,7 +148,11 @@ loveToHear=We'd love to hear from you.
 startsWith=Brave starts with
 startsWithOptionLastTime=My windows / tabs from last time
 startsWithOptionHomePage=Home page
-startsWithOptionNewTabPage=a new tab
+startsWithOptionNewTabPage=Dashboard
+tabCloseActionLastActive=Last active tab
+tabCloseActionNext=Next tab
+tabCloseActionFirst=First tab
+tabCloseActionParent=Parent tab
 newTabMode=A new tab shows
 newTabBlank=blank
 newTabNewTabPage=Dashboard
@@ -137,6 +167,7 @@ engineGoKey=Engine Go Key (Type First)
 switchToNewTabs=Switch to new tabs immediately
 paintTabs=Show tabs in page theme color
 tabsPerTabPage=Number of tabs per tab set:
+tabCloseAction=Which tab should be activated after the tab is closed:
 showTabPreviews=Show tab previews on hover
 showHistoryMatches=Show history matches
 showBookmarkMatches=Show bookmark matches
@@ -158,6 +189,7 @@ backupLedger=Backup your wallet
 balanceRecovered={{balance}} BTC was recovered and transferred to your Brave wallet.
 recoverLedger=Recover your wallet
 recover=Recover
+recoverFromFile=Import recovery keys
 printKeys=Print keys
 saveRecoveryFile=Save recovery file...
 advancedPrivacySettings=Advanced Privacy Settings:
@@ -228,6 +260,7 @@ engineGoKey=Engine Go Key (type first)
 braveSoftware=Brave Software
 emailAddress=Email address
 viewLog=View Log
+comingSoon=Coming soon!
 setDefaultButton=Set as default…
 setDefaultLabel=Brave is not your default browser:
 setDefaultAlwaysSwitch=Always check on startup

diff --git a/app/extensions/brave/locales/es/menu.properties b/app/extensions/brave/locales/es/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferencias…
 settings=Ajustes…
 bookmarksManager=Administrador de marcadores…
 importBrowserData=Importar datos del navegador...
-reportAnIssue=Reportar un problema
 submitFeedback=Enviar opinión…
 bookmarksToolbar=Barra de marcadores
 bravery=Escudos

diff --git a/app/extensions/brave/locales/eu/menu.properties b/app/extensions/brave/locales/eu/menu.properties
@@ -87,7 +87,6 @@ preferences=Hobespenak...
 settings=Hobespenak...
 bookmarksManager=Laster-marken hobespenak
 importBrowserData=Nabigatzailearen datuak inportatu...
-reportAnIssue=Arazo bati buruz ohartarazi
 submitFeedback=Iruzkina bidali...
 bookmarksToolbar=Laster-markaren erreminta taula 
 bravery=Shields

diff --git a/app/extensions/brave/locales/fr-FR/menu.properties b/app/extensions/brave/locales/fr-FR/menu.properties
@@ -87,7 +87,6 @@ preferences=Préférences…
 settings=Paramètres…
 bookmarksManager=Gestionnaire de signets…
 importBrowserData=Importer les données d'un navigateur...
-reportAnIssue=Remonter un problème
 submitFeedback=Envoyer votre avis…
 bookmarksToolbar=Barre des signets
 bravery=Boucliers

diff --git a/app/extensions/brave/locales/hi-IN/menu.properties b/app/extensions/brave/locales/hi-IN/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferences…
 settings=Settings…
 bookmarksManager=Bookmarks Manager…
 importBrowserData=Import Browser Data…
-reportAnIssue=विवाद दर्ज करें 
 submitFeedback=Submit Feedback…
 bookmarksToolbar=पुस्तचिह्ननित औज़ारपट्टी  
 bravery=Shields

diff --git a/app/extensions/brave/locales/id-ID/menu.properties b/app/extensions/brave/locales/id-ID/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferensi…
 settings=Pengaturan...
 bookmarksManager=Pengelola Markah…
 importBrowserData=Impor Data Peramban...
-reportAnIssue=Laporkan Masalah
 submitFeedback=Kirim Saran…
 bookmarksToolbar=Bilah Alat Markah
 bravery=Perisai

diff --git a/app/extensions/brave/locales/it-IT/menu.properties b/app/extensions/brave/locales/it-IT/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferenze...
 settings=Impostazioni...
 bookmarksManager=Gestione Segnalibri...
 importBrowserData=Importa Dati Browser...
-reportAnIssue=Riporta un problema
 submitFeedback=Invia Opinione...
 bookmarksToolbar=Barra dei segnalibri
 bravery=Protezione

diff --git a/app/extensions/brave/locales/ja-JP/menu.properties b/app/extensions/brave/locales/ja-JP/menu.properties
@@ -87,7 +87,6 @@ preferences=設定
 settings=設定
 bookmarksManager=ブックマーク マネージャー
 importBrowserData=ブラウザーデータをインポート
-reportAnIssue=問題を報告
 submitFeedback=フィードバックを送信
 bookmarksToolbar=ブックマーク ツールバー
 bravery=保護設定

diff --git a/app/extensions/brave/locales/ko-KR/menu.properties b/app/extensions/brave/locales/ko-KR/menu.properties
@@ -87,7 +87,6 @@ preferences=환경 설정...
 settings=설정...
 bookmarksManager=북마크 관리자...
 importBrowserData=브라우저 데이터 가져오기...
-reportAnIssue=문제 신고
 submitFeedback=피드백 제출하기...
 bookmarksToolbar=북마크 툴바
 bravery=Shields

diff --git a/app/extensions/brave/locales/ms-MY/menu.properties b/app/extensions/brave/locales/ms-MY/menu.properties
@@ -87,7 +87,6 @@ preferences=Keutamaan
 settings=Tetapan...
 bookmarksManager=Pengurus Tandabuku...
 importBrowserData=Import Data Pelayar...
-reportAnIssue=Laporkan Isu
 submitFeedback=Hantar Maklum balas...
 bookmarksToolbar=Bar alatan Tandabuku
 bravery=Perisai

diff --git a/app/extensions/brave/locales/nl-NL/menu.properties b/app/extensions/brave/locales/nl-NL/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferences…
 settings=Settings…
 bookmarksManager=Bookmarks Manager…
 importBrowserData=Import Browser Data…
-reportAnIssue=Report an Issue
 submitFeedback=Submit Feedback…
 bookmarksToolbar=Bookmarks Toolbar
 bravery=Shields

diff --git a/app/extensions/brave/locales/pl-PL/menu.properties b/app/extensions/brave/locales/pl-PL/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferences…
 settings=Settings…
 bookmarksManager=Bookmarks Manager…
 importBrowserData=Import Browser Data…
-reportAnIssue=Zgłoś problem
 submitFeedback=Submit Feedback…
 bookmarksToolbar=Pasek zakładek
 bravery=Shields

diff --git a/app/extensions/brave/locales/pt-BR/menu.properties b/app/extensions/brave/locales/pt-BR/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferências...
 settings=Configurações...
 bookmarksManager=Gestor de Marcadores...
 importBrowserData=Importar Dados do Navegador... 
-reportAnIssue=Relatar um Problema
 submitFeedback=Submeter Feedback… 
 bookmarksToolbar=Barra de Favoritos
 bravery=Escudos

diff --git a/app/extensions/brave/locales/ru/menu.properties b/app/extensions/brave/locales/ru/menu.properties
@@ -87,7 +87,6 @@ preferences=Настройки...
 settings=Настройки...
 bookmarksManager=Менеджер закладок...
 importBrowserData=Импорт данных браузера...
-reportAnIssue=Сообщить о проблеме
 submitFeedback=Оставить отзыв...
 bookmarksToolbar=Панель закладок
 bravery=Щиты

diff --git a/app/extensions/brave/locales/sl/menu.properties b/app/extensions/brave/locales/sl/menu.properties
@@ -87,7 +87,6 @@ preferences=Nastavitve ...
 settings=Nastavitve ...
 bookmarksManager=Upravitelj zaznamkov ...
 importBrowserData=Uvozi podatke brskalnika ...
-reportAnIssue=Poročajte o težavi
 submitFeedback=Pošlji odziv ...
 bookmarksToolbar=Orodna vrstica zaznamkov
 bravery=Ščiti

diff --git a/app/extensions/brave/locales/ta/menu.properties b/app/extensions/brave/locales/ta/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferences…
 settings=Settings…
 bookmarksManager=Bookmarks Manager…
 importBrowserData=Import Browser Data…
-reportAnIssue=பிரச்சனையை புகாரளி
 submitFeedback=Submit Feedback…
 bookmarksToolbar=புத்தகக்குறி கருவிப்பட்டை
 bravery=Shields

diff --git a/app/extensions/brave/locales/te/menu.properties b/app/extensions/brave/locales/te/menu.properties
@@ -87,7 +87,6 @@ preferences=Preferences…
 settings=Settings…
 bookmarksManager=Bookmarks Manager…
 importBrowserData=Import Browser Data…
-reportAnIssue=ఇష్యూ మాకు చెప్పుము 
 submitFeedback=Submit Feedback…
 bookmarksToolbar=బుక్ మార్క్స్ టూల్ బార్ 
 bravery=Shields