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 2019-10-04 21:30:44 +02:00
parent a361fdac9e 37ad3fbf0b
commit 39aaac2d1b
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -69,7 +69,7 @@ Also you can help by [translating KeeWeb](https://keeweb.oneskyapp.com) to your
KeeWeb is not free to develop. It takes time, requires paid code signing certificates and domains. KeeWeb is not free to develop. It takes time, requires paid code signing certificates and domains.
You can help the project or say "thank you" with this button: You can help the project or say "thank you" with this button:
[<img src="https://opencollective.com/keeweb/tiers/backer.svg?avatarHeight=50" alt="OpenCollective">](https://opencollective.com/keeweb#support) [<img src="https://opencollective.com/keeweb/tiers/backer.svg?avatarHeight=42&width=880" alt="OpenCollective">](https://opencollective.com/keeweb#support)
Please note: donation does not imply any type of service contract. Please note: donation does not imply any type of service contract.

3
app/manifest.appcache
View File

@ -2,3 +2,6 @@ CACHE MANIFEST
# YYYY-MM-DD:v0.0.0 # YYYY-MM-DD:v0.0.0
# updmin:v0.0.0 # updmin:v0.0.0
NETWORK:
*

2
desktop/package-lock.json generated
View File

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

2
desktop/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "KeeWeb", "name": "KeeWeb",
"version": "1.11.5", "version": "1.11.6",
"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",

8
package-lock.json generated
View File

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

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "keeweb", "name": "keeweb",
"version": "1.11.5", "version": "1.11.6",
"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,
@ -55,7 +55,7 @@
"jquery": "3.4.1", "jquery": "3.4.1",
"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": "1.5.3", "kdbxweb": "1.5.5",
"load-grunt-tasks": "5.1.0", "load-grunt-tasks": "5.1.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"marked": "^0.7.0", "marked": "^0.7.0",

5
release-notes.md
View File

@ -1,7 +1,10 @@
Release notes Release notes
------------- -------------
##### v1.12.0 (TBD) ##### v1.12.0 (TBD)
`-` #1022: fuzzy search `-` #1022: fuzzy search
##### v1.11.6 (2019-10-04)
`-` fix #1285: issues in moving entries across files
##### v1.11.5 (2019-09-29) ##### v1.11.5 (2019-09-29)
`-` fix #1279: error opening files with saved keyfiles `-` fix #1279: error opening files with saved keyfiles