keeweb/keeweb
1
0
Fork 0
mirror of https://github.com/keeweb/keeweb.git synced 2024-06-20 06:56:40 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	release-notes.md
This commit is contained in:
antelle 2020-08-08 14:29:11 +02:00
commit dbf212f0df
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
9 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yaml vendored
View File

@ -535,6 +535,7 @@ jobs:
if: ${{ github.repository == 'keeweb/keeweb' }} if: ${{ github.repository == 'keeweb/keeweb' }}
run: gsutil -m rsync -r -d -x "^\." gh-pages gs://app.keeweb.info/ run: gsutil -m rsync -r -d -x "^\." gh-pages gs://app.keeweb.info/
- name: Purge CloudFlare cache - name: Purge CloudFlare cache
if: ${{ github.repository == 'keeweb/keeweb' }}
env: env:
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
run: | run: |

18
app/scripts/views/details/details-view.js
View File

@ -156,11 +156,19 @@ class DetailsView extends View {
if (hideEmptyFields) { if (hideEmptyFields) {
const value = fieldView.model.value(); const value = fieldView.model.value();
if (!value || value.length === 0 || value.byteLength === 0) { if (!value || value.length === 0 || value.byteLength === 0) {
if ( if (this.model.isJustCreated) {
this.model.isJustCreated && const fieldsHiddenForNewEntriesWhenEmpty = [
['$UserName', '$Password'].indexOf(fieldView.model.name) >= 0 '$URL',
) { '$Notes',
return; // don't hide user for new records 'Tags',
'Expires',
'History'
];
if (
!fieldsHiddenForNewEntriesWhenEmpty.includes(fieldView.model.name)
) {
continue;
}
} }
fieldView.hide(); fieldView.hide();
} }

2
app/scripts/views/list-view.js
View File

@ -180,7 +180,7 @@ class ListView extends View {
} }
createTemplate() { createTemplate() {
if (!this.model.settings.templateHelpShown_) { if (!this.model.settings.templateHelpShown) {
Alerts.yesno({ Alerts.yesno({
icon: 'sticky-note-o', icon: 'sticky-note-o',
header: Locale.listAddTemplateHeader, header: Locale.listAddTemplateHeader,

2
desktop/app.js
View File

@ -125,7 +125,7 @@ app.on('activate', () => {
} }
}); });
app.on('before-quit', (e) => { app.on('before-quit', (e) => {
if (app.hookBeforeQuitEvent) { if (app.hookBeforeQuitEvent && mainWindow) {
e.preventDefault(); e.preventDefault();
emitRemoteEvent('launcher-before-quit'); emitRemoteEvent('launcher-before-quit');
} }

2
desktop/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "KeeWeb", "name": "KeeWeb",
"version": "1.15.4", "version": "1.15.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.15.4", "version": "1.15.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",

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "keeweb", "name": "keeweb",
"version": "1.15.4", "version": "1.15.6",
"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.15.4", "version": "1.15.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,

3
release-notes.md
View File

@ -1,6 +1,7 @@
Release notes Release notes
------------- -------------
##### v1.16.0 (TBD) ##### v1.15.6 (2020-08-08)
`-` fix #1553: empty fields display for templates
`-` fix #1581: double-clicking KeeWeb icon in Dock `-` fix #1581: double-clicking KeeWeb icon in Dock
##### v1.15.5 (2020-06-13) ##### v1.15.5 (2020-06-13)