Merge branch 'release-1.15'

This commit is contained in:
antelle 2020-06-07 11:03:39 +02:00
commit 09b00f3137
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
7 changed files with 10 additions and 6 deletions

View File

@ -205,7 +205,7 @@ function createDetailsFields(detailsView) {
if (field === 'otp' && model.otpGenerator) { if (field === 'otp' && model.otpGenerator) {
if (!otpEntry) { if (!otpEntry) {
fieldViews.push( fieldViews.push(
FieldViewOtp({ new FieldViewOtp({
name: '$' + field, name: '$' + field,
title: field, title: field,
value() { value() {

View File

@ -448,8 +448,8 @@ class DetailsView extends View {
return; return;
} }
this.model.initOtpGenerator();
if (this.model.external) { if (this.model.external) {
this.model.initOtpGenerator();
return; return;
} }
@ -757,6 +757,7 @@ class DetailsView extends View {
entryUpdated(skipRender) { entryUpdated(skipRender) {
Events.emit('entry-updated', { entry: this.model }); Events.emit('entry-updated', { entry: this.model });
this.initOtp();
if (!skipRender) { if (!skipRender) {
this.render(); this.render();
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "KeeWeb", "name": "KeeWeb",
"version": "1.15.0", "version": "1.15.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "KeeWeb", "name": "KeeWeb",
"version": "1.15.0", "version": "1.15.1",
"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-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "keeweb", "name": "keeweb",
"version": "1.15.0", "version": "1.15.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "keeweb", "name": "keeweb",
"version": "1.15.0", "version": "1.15.1",
"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,

View File

@ -1,5 +1,8 @@
Release notes Release notes
------------- -------------
##### v1.15.1 (2020-06-06)
`-` fix #1528: OTP generation for stored values
##### v1.15.0 (2020-06-06) ##### v1.15.0 (2020-06-06)
`+` YubiKey integration in two modes: OATH and Challenge-Response `+` YubiKey integration in two modes: OATH and Challenge-Response
`+` configs are now encrypted with a key stored in keychain `+` configs are now encrypted with a key stored in keychain