keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
antelle 2017-12-09 22:48:04 +01:00
parent 02aa303dfc 102c2804c2
commit d96df170c4
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/comp/cookie-manager.js
View File

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

2
desktop/package.json
View File

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

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "keeweb", "name": "keeweb",
"version": "1.6.1", "version": "1.6.2",
"description": "Free cross-platform password manager compatible with KeePass", "description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js", "main": "Gruntfile.js",
"private": true, "private": true,

11
release-notes.md
View File

@ -1,11 +1,14 @@
Release notes Release notes
------------- -------------
##### v1.7.0 (WIP) ##### v1.7.0 (WIP)
`+` support shared files in Google Drive `+` downgrading desktop apps
`-` fixed color flash on startup
`+` downgrading desktop app
`-` fixed calendar colors `-` 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) ##### v1.6.1 (2017-12-03)
`-` fixed white screen on startup `-` fixed white screen on startup