Merge branch 'release-1.4'

app/scripts/views/open-view.js

@@ -454,6 +454,7 @@ const OpenView = Backbone.View.extend({
         this.params.rev = null;
         this.params.keyFileName = fileInfo.get('keyFileName');
         this.params.keyFilePath = fileInfo.get('keyFilePath');
+        this.params.keyFileData = null;
         this.displayOpenFile();
         this.displayOpenKeyFile();
     },

bower.json

@@ -26,12 +26,12 @@
     "baron": "2.2.2",
     "bourbon": "4.2.7",
     "dropbox": "keeweb/dropbox-js#0ac0efdc2711eece73f6ac044459e1fd0d5e9390",
-    "font-awesome": "4.6.3",
-    "kdbxweb": "a4d58631f2c98667e0de2f46915db2dd79bddd07",
-    "normalize.css": "4.2.0",
-    "pikaday": "1.4.0",
+    "font-awesome": "4.7.0",
+    "kdbxweb": "1.0.1",
+    "normalize.css": "5.0.0",
+    "pikaday": "1.5.1",
     "FileSaver.js": "eligrey/FileSaver.js",
-    "jquery": "3.1.0",
+    "jquery": "3.1.1",
     "jsqrcode": "antelle/jsqrcode#0.1.3",
     "argon2-browser": "0.0.5"
   }

desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "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.4.0",
+  "version": "1.4.1",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "Gruntfile.js",
   "homepage": "https://keeweb.info",

release-notes.md

@@ -1,5 +1,9 @@
 Release notes
 -------------
+##### v1.4.1 (2017-03-26)
+`+` fix #544: read files with empty binaries  
+`+` fix #555: keyfile selection issue  
+
 ##### v1.4.0 (2017-02-04)
 KDBX4 format support and minor improvements  
 `+` password generator usability improvements