Merge branch 'master' into develop

app/scripts/comp/cookie-manager.js

@@ -32,8 +32,10 @@ const CookieManager = {
                         httpOnly: cookie.httpOnly,
                         expirationDate: cookie.expirationDate
                     }));
-                    if (JSON.stringify(cookies) !== this.cookiesStr) {
+                    const cookiesStr = JSON.stringify(cookies);
+                    if (cookiesStr !== this.cookiesStr) {
                         this.cookies = cookies;
+                        this.cookiesStr = cookiesStr;
                         RuntimeDataModel.instance.set('cookies', cookies);
                     }
                 }

desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.6.1",
+  "version": "1.6.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.6.1",
+  "version": "1.6.2",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "Gruntfile.js",
   "private": true,

release-notes.md

@@ -1,11 +1,14 @@
 Release notes
 -------------
 ##### v1.7.0 (WIP)
-`+` support shared files in Google Drive  
-`-` fixed color flash on startup  
-`+` downgrading desktop app  
+`+` downgrading desktop apps  
 `-` fixed calendar colors  
-`+` option to open keyfile from command line  
+`+` option to open a keyfile from command line  
+
+##### v1.6.2 (2017-12-09)
+`+` Google Drive shared files support  
+`-` fixed Google Drive authentication issues  
+`-` fixed a color flash on startup  
 
 ##### v1.6.1 (2017-12-03)
 `-` fixed white screen on startup