keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into develop 

# Conflicts:
#	app/templates/export/entry.hbs
#	release-notes.md
This commit is contained in:
antelle 2020-05-15 20:52:16 +02:00
parent c91e5de961 489eb5598c
commit 177b150c95
No known key found for this signature in database
GPG Key ID: 094A2F2D6136A4EE
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/templates/export/db.hbs
View File

@ -26,6 +26,9 @@
td:first-of-type { td:first-of-type {
width: 30%; width: 30%;
} }
td.field {
white-space: pre-wrap;
}
</style> </style>
</head> </head>
<body> <body>

8
app/templates/export/entry.hbs
View File

@ -5,12 +5,12 @@
{{#each fields as |field|}} {{#each fields as |field|}}
<tr> <tr>
<td>{{field.title}}</td> <td>{{field.title}}</td>
<td> <td class="field">
{{#if field.protect}} {{~#if field.protect~}}
<code>{{field.value}}</code> <code>{{field.value}}</code>
{{else}} {{~else~}}
{{field.value}} {{field.value}}
{{/if}} {{~/if~}}
</td> </td>
</tr> </tr>
{{/each}} {{/each}}

2
desktop/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "KeeWeb", "name": "KeeWeb",
"version": "1.14.2", "version": "1.14.3",
"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.14.2", "version": "1.14.3",
"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.14.2", "version": "1.14.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

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

4
release-notes.md
View File

@ -10,9 +10,11 @@ Release notes
`*` #1471: WebDAV url validation, only HTTPS is allowed `*` #1471: WebDAV url validation, only HTTPS is allowed
`+` #1350: clearing master password after auto lock period `+` #1350: clearing master password after auto lock period
`-` fix #1463: copying the original url instead of adding https: `-` fix #1463: copying the original url instead of adding https:
`*` disabled markdown in export
`-` fix #620: clearing middle-click clipboard in Linux `-` fix #620: clearing middle-click clipboard in Linux
##### v1.14.3 (2020-05-15)
`*` improved exporting files with markdown notes
##### v1.14.2 (2020-05-04) ##### v1.14.2 (2020-05-04)
`-` distinct redirect URIs for storage providers `-` distinct redirect URIs for storage providers