mirror of https://github.com/keeweb/keeweb.git
Merge branch 'release-1.18'
This commit is contained in:
commit
e348310602
|
@ -697,7 +697,7 @@ class AppModel {
|
|||
let needLoadKeyFile = false;
|
||||
if (!params.keyFileData && fileInfo && fileInfo.keyFileName) {
|
||||
params.keyFileName = fileInfo.keyFileName;
|
||||
if (this.settings.rememberKeyFiles === 'data') {
|
||||
if (this.settings.rememberKeyFiles === 'data' && fileInfo.keyFileHash) {
|
||||
params.keyFileData = FileModel.createKeyFileWithHash(fileInfo.keyFileHash);
|
||||
} else if (this.settings.rememberKeyFiles === 'path' && fileInfo.keyFilePath) {
|
||||
params.keyFilePath = fileInfo.keyFilePath;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "KeeWeb",
|
||||
"version": "1.18.1",
|
||||
"version": "1.18.2",
|
||||
"description": "Free cross-platform password manager compatible with KeePass",
|
||||
"main": "main.js",
|
||||
"homepage": "https://keeweb.info",
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "keeweb",
|
||||
"version": "1.18.1",
|
||||
"version": "1.18.2",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"version": "1.17.6",
|
||||
"version": "1.18.1",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.14.0",
|
||||
|
@ -67,7 +67,7 @@
|
|||
"jquery": "3.6.0",
|
||||
"json-loader": "^0.5.7",
|
||||
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
||||
"kdbxweb": "^2.0.0",
|
||||
"kdbxweb": "^2.0.1",
|
||||
"load-grunt-tasks": "5.1.0",
|
||||
"lodash": "^4.17.21",
|
||||
"marked": "^2.0.3",
|
||||
|
@ -11706,9 +11706,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/kdbxweb": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.0.tgz",
|
||||
"integrity": "sha512-oomAWfJRkgWU+1Bi20N2SXJbHLT2wnCibIsdXQm5HNQ8ot2wRa6weAMxvfekYWKbo3/mLKwLV8mq4cNhjXwhTw==",
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.1.tgz",
|
||||
"integrity": "sha512-ewghBv4gAGkUgtPv+qELC7U+qA5U6msKYod4UDtCrrAA4taEm13VSdZGxp2iBeIhkh/bciHmRlvtVoSTlLL+1g==",
|
||||
"dependencies": {
|
||||
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
||||
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
||||
|
@ -29846,9 +29846,9 @@
|
|||
}
|
||||
},
|
||||
"kdbxweb": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.0.tgz",
|
||||
"integrity": "sha512-oomAWfJRkgWU+1Bi20N2SXJbHLT2wnCibIsdXQm5HNQ8ot2wRa6weAMxvfekYWKbo3/mLKwLV8mq4cNhjXwhTw==",
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.1.tgz",
|
||||
"integrity": "sha512-ewghBv4gAGkUgtPv+qELC7U+qA5U6msKYod4UDtCrrAA4taEm13VSdZGxp2iBeIhkh/bciHmRlvtVoSTlLL+1g==",
|
||||
"requires": {
|
||||
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
||||
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "keeweb",
|
||||
"version": "1.18.1",
|
||||
"version": "1.18.2",
|
||||
"description": "Free cross-platform password manager compatible with KeePass",
|
||||
"main": "Gruntfile.js",
|
||||
"private": true,
|
||||
|
@ -69,7 +69,7 @@
|
|||
"jquery": "3.6.0",
|
||||
"json-loader": "^0.5.7",
|
||||
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
||||
"kdbxweb": "^2.0.0",
|
||||
"kdbxweb": "^2.0.1",
|
||||
"load-grunt-tasks": "5.1.0",
|
||||
"lodash": "^4.17.21",
|
||||
"marked": "^2.0.3",
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
Release notes
|
||||
-------------
|
||||
##### v1.18.2 (2021-05-08)
|
||||
`-` fix #1802: opening files with saved keyfiles
|
||||
|
||||
##### v1.18.1 (2021-05-08)
|
||||
`-` fixed entry attachments display
|
||||
|
||||
|
|
Loading…
Reference in New Issue