Merge branch 'master' into develop

app/scripts/auto-type/emitter/auto-type-emitter-linux.js

@@ -37,11 +37,13 @@ AutoTypeEmitter.prototype.setMod = function(mod, enabled) {
 };
 
 AutoTypeEmitter.prototype.text = function(text) {
-    Object.keys(this.mod).forEach(function (mod) {
-        this.pendingScript.push('keydown ' + ModMap[mod]);
-    });
-    this.pendingScript.push('type ' + text);
     var that = this;
+    Object.keys(this.mod).forEach(function (mod) {
+        that.pendingScript.push('keydown ' + ModMap[mod]);
+    });
+    that.pendingScript.push('type ' + text.split('').map(function(char) {
+        return char === '\'' ? '"\'"' : '\'' + char + '\'';
+    }).join(''));
     this.waitComplete(function(err) {
         if (err) { return that.callback(err); }
         Object.keys(that.mod).forEach(function (mod) {
@@ -70,6 +72,11 @@ AutoTypeEmitter.prototype.copyPaste = function(text) {
     this.waitComplete();
 };
 
+AutoTypeEmitter.prototype.wait = function(time) {
+    this.pendingScript.push('sleep ' + (time / 1000));
+    this.callback();
+};
+
 AutoTypeEmitter.prototype.waitComplete = function(callback) {
     if (this.pendingScript.length) {
         var script = this.pendingScript.join(' ');

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",

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "main.js",
   "homepage": "https://keeweb.info",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "Gruntfile.js",
   "homepage": "https://keeweb.info",

release-notes.md

@@ -1,6 +1,12 @@
 Release notes
 -------------
 
+##### v1.2.2 (2016-07-14)
+`-` fix special keys auto-type in linux  
+
+##### v1.2.1 (2016-07-12)
+`-` fix storage auth popups on desktop  
+
 ##### v1.2.0 (2016-07-11)
 Auto-type, ui improvements  
 `+` allow selecting attachments with click