From 1f4f3101f2140466e319d93427f015c4701642ec Mon Sep 17 00:00:00 2001 From: antelle Date: Mon, 4 Nov 2019 21:36:14 +0100 Subject: [PATCH 1/4] fix #1335: removed the menubar on Windows and Linux --- desktop/app.js | 2 ++ release-notes.md | 3 +++ 2 files changed, 5 insertions(+) diff --git a/desktop/app.js b/desktop/app.js index 7f43dbd0..5dbf6a9f 100644 --- a/desktop/app.js +++ b/desktop/app.js @@ -363,6 +363,8 @@ function setMenu() { electron.Menu.setApplicationMenu(menu); } else { mainWindow.setMenuBarVisibility(false); + mainWindow.setMenu(null); + electron.Menu.setApplicationMenu(null); } } diff --git a/release-notes.md b/release-notes.md index 1f96f214..e3f7e124 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,8 @@ Release notes ------------- +##### v1.12.3 (TBD) +`-` fix #1335: removed the menubar on Windows and Linux + ##### v1.12.2 (2019-11-03) `-` fixed non-working updater `-` fix #1336: saving disabled storage option From ecf2a65e1672d61417a3c596dacde6b31a3bc825 Mon Sep 17 00:00:00 2001 From: antelle Date: Wed, 6 Nov 2019 19:46:17 +0100 Subject: [PATCH 2/4] fix #1334: saving new files not working --- app/scripts/comp/launcher/launcher-cordova.js | 6 ------ .../comp/launcher/launcher-electron.js | 20 ++++--------------- release-notes.md | 1 + 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/app/scripts/comp/launcher/launcher-cordova.js b/app/scripts/comp/launcher/launcher-cordova.js index 667882dc..7d86270a 100644 --- a/app/scripts/comp/launcher/launcher-cordova.js +++ b/app/scripts/comp/launcher/launcher-cordova.js @@ -248,12 +248,6 @@ const Launcher = { window.cordova.exec(onFileSelected, callback, 'FileChooser', 'choose'); }, - getCookies(callback) { - // TODO - }, - setCookies(cookies) { - // TODO - }, fingerprints: { config: { diff --git a/app/scripts/comp/launcher/launcher-electron.js b/app/scripts/comp/launcher/launcher-electron.js index 3b0c953f..d520f83a 100644 --- a/app/scripts/comp/launcher/launcher-electron.js +++ b/app/scripts/comp/launcher/launcher-electron.js @@ -38,14 +38,13 @@ const Launcher = { const homePath = this.remReq('electron').app.getPath('userDesktop'); defaultPath = this.joinPath(homePath, defaultPath); } - this.remReq('electron').dialog.showSaveDialog( - { + this.remReq('electron') + .dialog.showSaveDialog({ title: Locale.launcherSave, defaultPath, filters: [{ name: Locale.launcherFileFilter, extensions: ['kdbx'] }] - }, - callback - ); + }) + .then(res => callback(res.filePath)); }, getUserDataPath(fileName) { if (!this.userDataPath) { @@ -271,17 +270,6 @@ const Launcher = { }); return ps; }, - getCookies(callback) { - this.electron().remote.session.defaultSession.cookies.get({}, callback); - }, - setCookies(cookies) { - if (cookies && cookies.length) { - const session = this.electron().remote.session.defaultSession; - for (const cookie of cookies) { - session.cookies.set(cookie, noop); - } - } - }, checkOpenFiles() { this.readyToOpenFiles = true; if (this.pendingFileToOpen) { diff --git a/release-notes.md b/release-notes.md index e3f7e124..93de8a3d 100644 --- a/release-notes.md +++ b/release-notes.md @@ -2,6 +2,7 @@ Release notes ------------- ##### v1.12.3 (TBD) `-` fix #1335: removed the menubar on Windows and Linux +`-` fix #1334: saving new files not working ##### v1.12.2 (2019-11-03) `-` fixed non-working updater From e21257de0cdc023d37e9e7352708718d68dd0361 Mon Sep 17 00:00:00 2001 From: antelle Date: Wed, 6 Nov 2019 19:48:57 +0100 Subject: [PATCH 3/4] bump version --- desktop/package-lock.json | 2 +- desktop/package.json | 2 +- package-lock.json | 2 +- package.json | 2 +- release-notes.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 2f17ca93..0705da29 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.12.2", + "version": "1.12.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/desktop/package.json b/desktop/package.json index e2b04d75..2fdb9016 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.12.2", + "version": "1.12.3", "description": "Free cross-platform password manager compatible with KeePass", "main": "main.js", "homepage": "https://keeweb.info", diff --git a/package-lock.json b/package-lock.json index 2a2c1b39..a0dbdd49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.12.2", + "version": "1.12.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d8b81fc8..f14aa793 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.12.2", + "version": "1.12.3", "description": "Free cross-platform password manager compatible with KeePass", "main": "Gruntfile.js", "private": true, diff --git a/release-notes.md b/release-notes.md index 93de8a3d..3857cb4f 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,6 +1,6 @@ Release notes ------------- -##### v1.12.3 (TBD) +##### v1.12.3 (2019-11-06) `-` fix #1335: removed the menubar on Windows and Linux `-` fix #1334: saving new files not working From f224aea44491c6525c8383c496020ebfd26243f4 Mon Sep 17 00:00:00 2001 From: antelle Date: Wed, 6 Nov 2019 19:53:50 +0100 Subject: [PATCH 4/4] fixed entry title input size --- app/styles/areas/_details.scss | 1 + release-notes.md | 1 + 2 files changed, 2 insertions(+) diff --git a/app/styles/areas/_details.scss b/app/styles/areas/_details.scss index 942e10d3..1b1ef343 100644 --- a/app/styles/areas/_details.scss +++ b/app/styles/areas/_details.scss @@ -64,6 +64,7 @@ font-weight: bold; position: relative; top: -2px; + min-width: 0; @include mobile { width: 100%; } diff --git a/release-notes.md b/release-notes.md index 3857cb4f..bb47c9ea 100644 --- a/release-notes.md +++ b/release-notes.md @@ -3,6 +3,7 @@ Release notes ##### v1.12.3 (2019-11-06) `-` fix #1335: removed the menubar on Windows and Linux `-` fix #1334: saving new files not working +`-` fixed entry title input size ##### v1.12.2 (2019-11-03) `-` fixed non-working updater