mirror of
https://github.com/keeweb/keeweb.git
synced 2024-06-29 08:00:53 +02:00
Merge branch 'master' into develop
This commit is contained in:
commit
6929931cae
|
@ -697,7 +697,7 @@ class AppModel {
|
||||||
let needLoadKeyFile = false;
|
let needLoadKeyFile = false;
|
||||||
if (!params.keyFileData && fileInfo && fileInfo.keyFileName) {
|
if (!params.keyFileData && fileInfo && fileInfo.keyFileName) {
|
||||||
params.keyFileName = fileInfo.keyFileName;
|
params.keyFileName = fileInfo.keyFileName;
|
||||||
if (this.settings.rememberKeyFiles === 'data') {
|
if (this.settings.rememberKeyFiles === 'data' && fileInfo.keyFileHash) {
|
||||||
params.keyFileData = FileModel.createKeyFileWithHash(fileInfo.keyFileHash);
|
params.keyFileData = FileModel.createKeyFileWithHash(fileInfo.keyFileHash);
|
||||||
} else if (this.settings.rememberKeyFiles === 'path' && fileInfo.keyFilePath) {
|
} else if (this.settings.rememberKeyFiles === 'path' && fileInfo.keyFilePath) {
|
||||||
params.keyFilePath = fileInfo.keyFilePath;
|
params.keyFilePath = fileInfo.keyFilePath;
|
||||||
|
|
|
@ -3,10 +3,10 @@ import { Model } from 'framework/model';
|
||||||
class AttachmentModel extends Model {
|
class AttachmentModel extends Model {
|
||||||
getBinary() {
|
getBinary() {
|
||||||
let data = this.data;
|
let data = this.data;
|
||||||
if (data && data.ref) {
|
if (data?.value) {
|
||||||
data = data.value;
|
data = data.value;
|
||||||
}
|
}
|
||||||
if (data && data.getBinary) {
|
if (data?.getBinary) {
|
||||||
data = data.getBinary();
|
data = data.getBinary();
|
||||||
}
|
}
|
||||||
if (data instanceof ArrayBuffer && data.byteLength) {
|
if (data instanceof ArrayBuffer && data.byteLength) {
|
||||||
|
|
|
@ -357,7 +357,7 @@ class EntryModel extends Model {
|
||||||
addAttachment(name, data) {
|
addAttachment(name, data) {
|
||||||
this._entryModified();
|
this._entryModified();
|
||||||
return this.file.db.createBinary(data).then((binaryRef) => {
|
return this.file.db.createBinary(data).then((binaryRef) => {
|
||||||
this.entry.binaries[name] = binaryRef;
|
this.entry.binaries.set(name, binaryRef);
|
||||||
this._fillByEntry();
|
this._fillByEntry();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "KeeWeb",
|
"name": "KeeWeb",
|
||||||
"version": "1.18.0",
|
"version": "1.18.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",
|
||||||
|
|
|
@ -63,15 +63,15 @@ module.exports = function (grunt) {
|
||||||
'electron-patch:win32-x64',
|
'electron-patch:win32-x64',
|
||||||
'electron-patch:win32-ia32',
|
'electron-patch:win32-ia32',
|
||||||
'electron-patch:win32-arm64',
|
'electron-patch:win32-arm64',
|
||||||
sign ? 'sign-exe:win32-build-x64' : 'noop',
|
|
||||||
sign ? 'sign-exe:win32-build-ia32' : 'noop',
|
|
||||||
sign ? 'sign-exe:win32-build-arm64' : 'noop',
|
|
||||||
'copy:native-modules-win32-x64',
|
'copy:native-modules-win32-x64',
|
||||||
'copy:native-modules-win32-ia32',
|
'copy:native-modules-win32-ia32',
|
||||||
'copy:native-modules-win32-arm64',
|
'copy:native-modules-win32-arm64',
|
||||||
'copy:native-messaging-host-win32-x64',
|
'copy:native-messaging-host-win32-x64',
|
||||||
'copy:native-messaging-host-win32-ia32',
|
'copy:native-messaging-host-win32-ia32',
|
||||||
'copy:native-messaging-host-win32-arm64'
|
'copy:native-messaging-host-win32-arm64',
|
||||||
|
sign ? 'sign-exe:win32-build-x64' : 'noop',
|
||||||
|
sign ? 'sign-exe:win32-build-ia32' : 'noop',
|
||||||
|
sign ? 'sign-exe:win32-build-arm64' : 'noop'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
grunt.registerTask('build-desktop-executables', [
|
grunt.registerTask('build-desktop-executables', [
|
||||||
|
|
18
package-lock.json
generated
18
package-lock.json
generated
|
@ -1,11 +1,11 @@
|
||||||
{
|
{
|
||||||
"name": "keeweb",
|
"name": "keeweb",
|
||||||
"version": "1.18.0",
|
"version": "1.18.2",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"version": "1.17.6",
|
"version": "1.18.1",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/core": "^7.14.0",
|
"@babel/core": "^7.14.0",
|
||||||
|
@ -67,7 +67,7 @@
|
||||||
"jquery": "3.6.0",
|
"jquery": "3.6.0",
|
||||||
"json-loader": "^0.5.7",
|
"json-loader": "^0.5.7",
|
||||||
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
||||||
"kdbxweb": "^2.0.0",
|
"kdbxweb": "^2.0.1",
|
||||||
"load-grunt-tasks": "5.1.0",
|
"load-grunt-tasks": "5.1.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"marked": "^2.0.3",
|
"marked": "^2.0.3",
|
||||||
|
@ -11706,9 +11706,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/kdbxweb": {
|
"node_modules/kdbxweb": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.1.tgz",
|
||||||
"integrity": "sha512-oomAWfJRkgWU+1Bi20N2SXJbHLT2wnCibIsdXQm5HNQ8ot2wRa6weAMxvfekYWKbo3/mLKwLV8mq4cNhjXwhTw==",
|
"integrity": "sha512-ewghBv4gAGkUgtPv+qELC7U+qA5U6msKYod4UDtCrrAA4taEm13VSdZGxp2iBeIhkh/bciHmRlvtVoSTlLL+1g==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
||||||
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
||||||
|
@ -29846,9 +29846,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"kdbxweb": {
|
"kdbxweb": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-2.0.1.tgz",
|
||||||
"integrity": "sha512-oomAWfJRkgWU+1Bi20N2SXJbHLT2wnCibIsdXQm5HNQ8ot2wRa6weAMxvfekYWKbo3/mLKwLV8mq4cNhjXwhTw==",
|
"integrity": "sha512-ewghBv4gAGkUgtPv+qELC7U+qA5U6msKYod4UDtCrrAA4taEm13VSdZGxp2iBeIhkh/bciHmRlvtVoSTlLL+1g==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
|
||||||
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
"xmldom": "github:keeweb/xmldom#ec8f61f723e2f403adaf7a1bbf55ced4ff1ea0c6"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "keeweb",
|
"name": "keeweb",
|
||||||
"version": "1.18.0",
|
"version": "1.18.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,
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
"jquery": "3.6.0",
|
"jquery": "3.6.0",
|
||||||
"json-loader": "^0.5.7",
|
"json-loader": "^0.5.7",
|
||||||
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
||||||
"kdbxweb": "^2.0.0",
|
"kdbxweb": "^2.0.1",
|
||||||
"load-grunt-tasks": "5.1.0",
|
"load-grunt-tasks": "5.1.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"marked": "^2.0.3",
|
"marked": "^2.0.3",
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
Release notes
|
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
|
||||||
|
|
||||||
##### v1.18.0 (2021-05-08)
|
##### v1.18.0 (2021-05-08)
|
||||||
`+` browser extension "KeeWeb Connect"
|
`+` browser extension "KeeWeb Connect"
|
||||||
`+` support for KeePassXC-Browser
|
`+` support for KeePassXC-Browser
|
||||||
|
|
Loading…
Reference in New Issue
Block a user