keeweb/keeweb
1
0
Fork 0
mirror of https://github.com/keeweb/keeweb.git synced 2024-06-28 07:50:55 +02:00
Code Issues Releases Wiki Activity

Merge branch 'release-1.14'

Browse Source
This commit is contained in:
antelle 2020-05-15 20:26:25 +02:00
commit 9827b871fc
No known key found for this signature in database
GPG Key ID: 094A2F2D6136A4EE
8 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/scripts/comp/format/kdbx-to-html.js
View File

@ -17,7 +17,7 @@ const FieldMapping = [
{ name: 'UserName', locStr: 'user' }, { name: 'UserName', locStr: 'user' },
{ name: 'Password', locStr: 'password', protect: true }, { name: 'Password', locStr: 'password', protect: true },
{ name: 'URL', locStr: 'website' }, { name: 'URL', locStr: 'website' },
{ name: 'Notes', locStr: 'notes', markdown: true } { name: 'Notes', locStr: 'notes' }
]; ];
const KnownFields = { 'Title': true }; const KnownFields = { 'Title': true };
@ -42,21 +42,12 @@ function walkEntry(db, entry, parents) {
const path = parents.map(group => group.name).join(' / '); const path = parents.map(group => group.name).join(' / ');
const fields = []; const fields = [];
for (const field of FieldMapping) { for (const field of FieldMapping) {
let value = entryField(entry, field.name); const value = entryField(entry, field.name);
if (value) { if (value) {
let html = false;
if (field.markdown && AppSettingsModel.useMarkdown) {
const converted = MdToHtml.convert(value);
if (converted.html) {
value = converted.html;
html = true;
}
}
fields.push({ fields.push({
title: StringFormat.capFirst(Locale[field.locStr]), title: StringFormat.capFirst(Locale[field.locStr]),
value, value,
protect: field.protect, protect: field.protect
html
}); });
} }
} }

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

@ -25,6 +25,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>

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

@ -5,16 +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~}}
{{#if field.html}} {{field.value}}
{{{field.value}}} {{~/if~}}
{{else}}
{{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,

3
release-notes.md
View File

@ -1,5 +1,8 @@
Release notes Release notes
------------- -------------
##### 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