From 28d866c0010954011d99bed4b92cdf7935613869 Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Sun, 26 Dec 2021 17:43:27 +0100 Subject: [PATCH 1/2] enable useHTTP for full electron version --- CHANGELOG.md | 1 + js/electron.js | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6283995..539e33ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ _This release is scheduled to be released on 2022-01-01._ - Fixed User-Agent-Header for newsfeed and calendar module (#2729). - Replace broken shields in Readme and use https for links. - Fixed electron tests with retry. +- Fix useHttp for full version #2749 ## [2.17.1] - 2021-10-01 diff --git a/js/electron.js b/js/electron.js index 2c44ab02..509b5474 100644 --- a/js/electron.js +++ b/js/electron.js @@ -53,7 +53,7 @@ function createWindow() { // If config.address is not defined or is an empty string (listening on all interfaces), connect to localhost let prefix; - if (config["tls"] !== null && config["tls"]) { + if ((config["tls"] !== null && config["tls"]) || config.useHttps) { prefix = "https://"; } else { prefix = "http://"; @@ -140,6 +140,13 @@ app.on("before-quit", (event) => { process.exit(0); }); +/* handle errors from self signed certificates */ + +app.on("certificate-error", (event, webContents, url, error, certificate, callback) => { + event.preventDefault(); + callback(true); +}); + // Start the core application if server is run on localhost // This starts all node helpers and starts the webserver. if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].includes(config.address)) { From 446bb229bc0d36da3bf58aaa4a15118ba47921a0 Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Sun, 26 Dec 2021 17:53:28 +0100 Subject: [PATCH 2/2] fix changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 539e33ee..2c3f0f7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,9 @@ _This release is scheduled to be released on 2022-01-01._ - Fixed User-Agent-Header for newsfeed and calendar module (#2729). - Replace broken shields in Readme and use https for links. - Fixed electron tests with retry. -- Fix useHttp for full version #2749 +- Fixed Calendar recurring cross timezone error (add/subtract a day, not just offset hours) (#2632) +- Fixed Calendar showEnd and Full Date overlay (#2629) +- Fix useHttps for full version (#2749) ## [2.17.1] - 2021-10-01