kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 20:22:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into cal-again2

Browse Source
This commit is contained in:
sam detweiler 2020-11-28 19:23:15 -06:00 committed by GitHub
commit 137facf95a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -35,6 +35,7 @@ _This release is scheduled to be released on 2021-01-01._
- Fix calendar full day event east of UTC start time (#2200) - Fix calendar full day event east of UTC start time (#2200)
- Fix non-fullday recurring rule processing (#2216) - Fix non-fullday recurring rule processing (#2216)
## [2.13.0] - 2020-10-01 ## [2.13.0] - 2020-10-01
Special thanks to the following contributors: @bryanzzhu, @bugsounet, @chamakura, @cjbrunner, @easyas314, @larryare, @oemel09, @rejas, @sdetweil & @sthuber90. Special thanks to the following contributors: @bryanzzhu, @bugsounet, @chamakura, @cjbrunner, @easyas314, @larryare, @oemel09, @rejas, @sdetweil & @sthuber90.

1
modules/default/calendar/calendarfetcher.js
View File

@ -111,6 +111,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
if (event.type === "VEVENT") { if (event.type === "VEVENT") {
let startDate = eventDate(event, "start"); let startDate = eventDate(event, "start");
let endDate; let endDate;
Log.debug("\nevent=" + JSON.stringify(event)); Log.debug("\nevent=" + JSON.stringify(event));
if (typeof event.end !== "undefined") { if (typeof event.end !== "undefined") {
endDate = eventDate(event, "end"); endDate = eventDate(event, "end");