kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-05 07:08:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1580 from lavolp3/lavolp3-patch-1

Browse Source 
Changed defaut dateEndFormat
This commit is contained in:
Michael Teeuw 2019-02-19 15:47:41 +01:00 committed by GitHub
commit 9bf0d4f804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -33,6 +33,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Calendar: only show repeating count if the event is actually repeating [#1534](https://github.com/MichMich/MagicMirror/pull/1534) - Calendar: only show repeating count if the event is actually repeating [#1534](https://github.com/MichMich/MagicMirror/pull/1534)
- Calendar: Fix exdate handling when multiple values are specified (comma separated) - Calendar: Fix exdate handling when multiple values are specified (comma separated)
- Fix null dereference in moduleNeedsUpdate when the module isn't visible - Fix null dereference in moduleNeedsUpdate when the module isn't visible
- Calendar: Fixed event end times by setting default calendarEndTime to "LT" (Local time format). [#1479]
### New weather module ### New weather module
- Fixed weather forecast table display [#1499](https://github.com/MichMich/MagicMirror/issues/1499). - Fixed weather forecast table display [#1499](https://github.com/MichMich/MagicMirror/issues/1499).

2
modules/default/calendar/calendar.js
View File

@ -26,7 +26,7 @@ Module.register("calendar", {
urgency: 7, urgency: 7,
timeFormat: "relative", timeFormat: "relative",
dateFormat: "MMM Do", dateFormat: "MMM Do",
dateEndFormat: "HH:mm", dateEndFormat: "LT",
fullDayEventDateFormat: "MMM Do", fullDayEventDateFormat: "MMM Do",
showEnd: false, showEnd: false,
getRelative: 6, getRelative: 6,