From 4ded60874ff6cd6f9b18aef01fbbad2c93371475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bugsounet=20-=20C=C3=A9dric?= Date: Wed, 30 Dec 2020 11:34:09 +0100 Subject: [PATCH 1/6] No Text Select for Touch Screen use --- css/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/main.css b/css/main.css index bca48f9e..16c281be 100644 --- a/css/main.css +++ b/css/main.css @@ -2,6 +2,7 @@ html { cursor: none; overflow: hidden; background: #000; + user-select: none; } ::-webkit-scrollbar { From 3e5c1a278b50272857c75df9fcb1cac0a501d6bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bugsounet=20-=20C=C3=A9dric?= Date: Wed, 30 Dec 2020 11:38:28 +0100 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef2f82d..4771319d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ _This release is scheduled to be released on 2021-01-01._ ### Fixed +- No select Text for TouchScreen use - JSON Parse translation files with comments crashing UI. (#2149) - Calendar parsing where RRULE bug returns wrong date, add Windows timezone name support. (#2145, #2151) - Wrong node-ical version installed (package.json) requested version. (#2153) From 4d09abe725c3d8da1ec8535ed411308ec8fd6c7e Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Thu, 31 Dec 2020 07:40:40 -0600 Subject: [PATCH 3/6] fix node-ical version 0.12.7 for bad rrule throw --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef2f82d..4e981a81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ _This release is scheduled to be released on 2021-01-01._ - update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379) - Added missing function call in module.show() - remove undefined objects from modules array (#2382) +- update node-ical version again, 0.12.7, change RRULE fix (#2371, #2379), node-ical now throws error (which we catch) ## [2.13.0] - 2020-10-01 diff --git a/package.json b/package.json index 551a00b1..5bdaa51a 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "iconv-lite": "^0.6.2", "module-alias": "^2.2.2", "moment": "^2.29.1", - "node-ical": "^0.12.5", + "node-ical": "^0.12.7", "request": "^2.88.2", "rrule": "^2.6.6", "rrule-alt": "^2.2.8", From 020c8ccd2a0bdc37f2e8e78189e86fdb38917a6c Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Thu, 31 Dec 2020 09:08:23 -0600 Subject: [PATCH 4/6] fix update notification 2383 --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e981a81..12b0dae0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ _This release is scheduled to be released on 2021-01-01._ - Added missing function call in module.show() - remove undefined objects from modules array (#2382) - update node-ical version again, 0.12.7, change RRULE fix (#2371, #2379), node-ical now throws error (which we catch) +- update simple-git version to 2.31 unhandled promise rejection (#2383) ## [2.13.0] - 2020-10-01 diff --git a/package.json b/package.json index 5bdaa51a..b98b1407 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "request": "^2.88.2", "rrule": "^2.6.6", "rrule-alt": "^2.2.8", - "simple-git": "^2.26.0", + "simple-git": "^2.31.0", "socket.io": "^3.0.4", "valid-url": "^1.0.9" }, From 9ea7de8b44a45786f9151801a5c06c72bacefd55 Mon Sep 17 00:00:00 2001 From: Mike Bishop Date: Thu, 31 Dec 2020 10:01:47 -0500 Subject: [PATCH 5/6] Permit substituting a falsy value in translator variables --- js/translator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/translator.js b/js/translator.js index 5dc50045..82eec53a 100644 --- a/js/translator.js +++ b/js/translator.js @@ -68,7 +68,7 @@ var Translator = (function () { template = variables.fallback; } return template.replace(new RegExp("{([^}]+)}", "g"), function (_unused, varName) { - return variables[varName] || "{" + varName + "}"; + return varName in variables ? variables[varName] : "{" + varName + "}"; }); } From c9fb38981e636faffb7e7372a75300281f8e38f7 Mon Sep 17 00:00:00 2001 From: Mike Bishop Date: Thu, 31 Dec 2020 10:11:43 -0500 Subject: [PATCH 6/6] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef2f82d..bf5be0bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ _This release is scheduled to be released on 2021-01-01._ - update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379) - Added missing function call in module.show() - remove undefined objects from modules array (#2382) +- Translator variables can have falsy values (e.g. empty string) ## [2.13.0] - 2020-10-01