From e6556ca92d28a27650335a8959ae0896a62fb5a9 Mon Sep 17 00:00:00 2001 From: antelle Date: Mon, 19 Aug 2019 23:33:52 +0200 Subject: [PATCH 1/5] 2019 --- package/docker-rpi/Dockerfile | 2 +- package/docker/Dockerfile | 2 +- plugins/keeweb-plugin/keeweb-plugin.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/docker-rpi/Dockerfile b/package/docker-rpi/Dockerfile index cf24baa1..57ea1062 100644 --- a/package/docker-rpi/Dockerfile +++ b/package/docker-rpi/Dockerfile @@ -1,6 +1,6 @@ # KeeWeb official docker container # https://keeweb.info -# (C) Antelle 2017, MIT license https://github.com/keeweb/keeweb +# (C) Antelle 2019, MIT license https://github.com/keeweb/keeweb # Based on nginx-ssl-secure https://github.com/MarvAmBass/docker-nginx-ssl-secure/ # Building locally: diff --git a/package/docker/Dockerfile b/package/docker/Dockerfile index ce5e8bbd..9074a70f 100644 --- a/package/docker/Dockerfile +++ b/package/docker/Dockerfile @@ -1,6 +1,6 @@ # KeeWeb official docker container # https://keeweb.info -# (C) Antelle 2017, MIT license https://github.com/keeweb/keeweb +# (C) Antelle 2019, MIT license https://github.com/keeweb/keeweb # Based on nginx-ssl-secure https://github.com/MarvAmBass/docker-nginx-ssl-secure/ # Building locally: diff --git a/plugins/keeweb-plugin/keeweb-plugin.js b/plugins/keeweb-plugin/keeweb-plugin.js index 236084fe..73b60cc9 100644 --- a/plugins/keeweb-plugin/keeweb-plugin.js +++ b/plugins/keeweb-plugin/keeweb-plugin.js @@ -2,7 +2,7 @@ /** * KeeWeb plugin creator - * (C) Antelle 2017, MIT license https://github.com/keeweb/keeweb + * (C) Antelle 2019, MIT license https://github.com/keeweb/keeweb */ /* eslint-disable no-console */ From c5c64bee2058ccf0f7b349db3dfe6eaad5d679ac Mon Sep 17 00:00:00 2001 From: antelle Date: Tue, 20 Aug 2019 20:18:16 +0200 Subject: [PATCH 2/5] fix #1235: custom themes loading --- .eslintrc | 2 +- app/scripts/plugins/theme-vars.js | 2 +- release-notes.md | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.eslintrc b/.eslintrc index 2b29bd37..bb8a027f 100644 --- a/.eslintrc +++ b/.eslintrc @@ -45,7 +45,7 @@ "message": "Prefer named exports" } ], - "import/no-webpack-loader-syntax": "error", + "import/no-webpack-loader-syntax": "off", "import/no-relative-parent-imports": "error", "import/first": "error", "import/no-namespace": "error", diff --git a/app/scripts/plugins/theme-vars.js b/app/scripts/plugins/theme-vars.js index 18e64817..cd7143b8 100644 --- a/app/scripts/plugins/theme-vars.js +++ b/app/scripts/plugins/theme-vars.js @@ -1,4 +1,4 @@ -const ThemeVarsScss = require('../../styles/base/_theme-vars.scss'); +const ThemeVarsScss = require('raw-loader!../../styles/base/_theme-vars.scss').default; const ThemeDefaults = require('../../styles/themes/_theme-defaults.scss'); const Color = require('../util/color'); diff --git a/release-notes.md b/release-notes.md index 4569b46f..ce8f9dad 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,8 @@ Release notes ------------- +##### v1.9.1 (2019-08-20) +`-` fix #1235: custom themes loading + ##### v1.9.1 (2019-08-19) `-` fix #1231: tooltip arrow positioning `+` improved ranking search From ba29687865edd8ed9ff753bec6d8cee94c409402 Mon Sep 17 00:00:00 2001 From: antelle Date: Thu, 22 Aug 2019 22:15:04 +0200 Subject: [PATCH 3/5] fix #1234 auto-type issues in xubuntu/xfce --- app/scripts/comp/launcher-electron.js | 11 ++++++++--- release-notes.md | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/scripts/comp/launcher-electron.js b/app/scripts/comp/launcher-electron.js index 3d40b2ec..34b3f312 100644 --- a/app/scripts/comp/launcher-electron.js +++ b/app/scripts/comp/launcher-electron.js @@ -221,7 +221,7 @@ const Launcher = { spawn(config) { const ts = logger.ts(); let complete = config.complete; - const ps = this.remReq('child_process').spawn(config.cmd, config.args); + const ps = this.req('child_process').spawn(config.cmd, config.args); [ps.stdin, ps.stdout, ps.stderr].forEach(s => s.setEncoding('utf-8')); let stderr = ''; let stdout = ''; @@ -254,12 +254,17 @@ const Launcher = { }); if (config.data) { try { - ps.stdin.write(config.data); - ps.stdin.end(); + ps.stdin.end(config.data); } catch (e) { logger.error('spawn write error', e); } } + process.nextTick(() => { + // it should work without destroy, but a process doesn't get launched + // xubuntu-desktop 19.04 / xfce + // see https://github.com/keeweb/keeweb/issues/1234 + ps.stdin.destroy(); + }); return ps; }, getCookies(callback) { diff --git a/release-notes.md b/release-notes.md index ce8f9dad..66c75750 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,7 +1,8 @@ Release notes ------------- -##### v1.9.1 (2019-08-20) +##### v1.9.1 (2019-08-22) `-` fix #1235: custom themes loading +`-` fix #1234 auto-type issues in xubuntu/xfce ##### v1.9.1 (2019-08-19) `-` fix #1231: tooltip arrow positioning From 9375f5c2812fdeadb5f09f42e5dbe3694f9fd369 Mon Sep 17 00:00:00 2001 From: antelle Date: Thu, 22 Aug 2019 22:23:38 +0200 Subject: [PATCH 4/5] 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 a5ad0f1d..af13de6c 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.9.1", + "version": "1.9.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/desktop/package.json b/desktop/package.json index da79602a..41e80a6d 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.9.1", + "version": "1.9.2", "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 0c3121ec..e3938b92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.9.1", + "version": "1.9.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c65e0e07..1fd05319 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.9.1", + "version": "1.9.2", "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 66c75750..302a7760 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,6 +1,6 @@ Release notes ------------- -##### v1.9.1 (2019-08-22) +##### v1.9.2 (2019-08-22) `-` fix #1235: custom themes loading `-` fix #1234 auto-type issues in xubuntu/xfce From a35817c3790dfff2bd80d4d64a2ad06b2f288a3e Mon Sep 17 00:00:00 2001 From: antelle Date: Thu, 22 Aug 2019 22:25:59 +0200 Subject: [PATCH 5/5] up languages --- app/scripts/locales/de-DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/locales/de-DE.json b/app/scripts/locales/de-DE.json index 4caadfd8..8038dcf2 100644 --- a/app/scripts/locales/de-DE.json +++ b/app/scripts/locales/de-DE.json @@ -109,7 +109,7 @@ "genPresetMac": "MAC-Adresse", "genPresetHash128": "128-Bit Hash", "genPresetHash256": "256-Bit Hash", - "genHidePass": "Password ausblenden", + "genHidePass": "Passwort ausblenden", "genShowPass": "Passwort einblenden", "grpTitle": "Gruppe", "grpSearch": "Suche für Einträge in dieser Gruppe aktivieren",