Merge branch 'release-1.2'

app/scripts/comp/popup-notifier.js

@@ -35,11 +35,11 @@ var PopupNotifier = {
     _openLauncherWindow: function(url, title, settings) {
         var opts = {
             show: false,
-            'web-preferences': {
-                'node-integration': false,
-                'web-security': false,
-                'allow-displaying-insecure-content': true,
-                'allow-running-insecure-content': true
+            webPreferences: {
+                nodeIntegration: false,
+                webSecurity: false,
+                allowDisplayingInsecureContent: true,
+                allowRunningInsecureContent: true
             }
         };
         if (settings) {
@@ -68,7 +68,7 @@ var PopupNotifier = {
                 PopupNotifier.processReturnToApp(toUrl);
             }
         });
-        win.loadUrl(url);
+        win.loadURL(url);
         win.show();
         win.on('closed', function() {
             setTimeout(PopupNotifier.triggerClosed.bind(PopupNotifier, win), Timeouts.CheckWindowClosed);

bower.json

@@ -25,7 +25,7 @@
     "backbone": "1.3.3",
     "baron": "2.2.2",
     "bourbon": "4.2.7",
-    "dropbox": "keeweb/dropbox-js#0.10.6",
+    "dropbox": "keeweb/dropbox-js#0.10.8",
     "font-awesome": "4.6.3",
     "kdbxweb": "0.4.1",
     "normalize.css": "4.1.1",

release-notes.md

@@ -1,6 +1,9 @@
 Release notes
 -------------
 
+##### v1.2.1 (2016-07-)
+`-` fix storage auth popups on desktop  
+
 ##### v1.2.0 (2016-07-11)
 Auto-type, ui improvements  
 `+` allow selecting attachments with click