Merge branch 'release-1.11'

This commit is contained in:
antelle 2019-10-04 21:13:43 +02:00
commit 87cb6f8262
5 changed files with 11 additions and 8 deletions

View File

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

View File

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

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.11.5",
"version": "1.11.6",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -7769,9 +7769,9 @@
"integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="
},
"kdbxweb": {
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-1.5.3.tgz",
"integrity": "sha512-zOLIiDOREQ/5geQJlsIa+LnyJXsglPOA3Xrtqg5xmkFbWj/HBKcLwg4QIljKgMYAsjcKYX53nRl0/y1HSa0XRw==",
"version": "1.5.5",
"resolved": "https://registry.npmjs.org/kdbxweb/-/kdbxweb-1.5.5.tgz",
"integrity": "sha512-RwQ4w1rNUwu97x1gUb4vmBZOqrM85RUPmyT9Dcqbu+9du3t+CyJaQY94a23OX2mjTRY7BJnARJqSmFEoM0JyUA==",
"requires": {
"pako": "github:keeweb/pako#653c0b00d8941c89d09ed4546d2179001ec44efc",
"text-encoding": "github:keeweb/text-encoding#4dfb7cb0954c222852092f8b06ae4f6b4f60bfbb",

View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.11.5",
"version": "1.11.6",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"private": true,
@ -55,7 +55,7 @@
"jquery": "3.4.1",
"json-loader": "^0.5.7",
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
"kdbxweb": "1.5.3",
"kdbxweb": "1.5.5",
"load-grunt-tasks": "5.1.0",
"lodash": "^4.17.15",
"marked": "^0.7.0",

View File

@ -1,5 +1,8 @@
Release notes
-------------
##### v1.11.6 (2019-10-05)
`-` fix #1285: issues in moving entries across files
##### v1.11.5 (2019-09-29)
`-` fix #1279: error opening files with saved keyfiles