From 561ae102fbeeeef9e78b0e55593a83b74a62efc7 Mon Sep 17 00:00:00 2001 From: eouia Date: Thu, 6 Jul 2017 11:57:16 +0200 Subject: [PATCH 1/5] add symbol and color on broadcasted events --- modules/default/calendar/calendar.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 9ab864b9..ad6024f9 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -522,6 +522,8 @@ Module.register("calendar", { var calendar = this.calendarData[url]; for (var e in calendar) { var event = cloneObject(calendar[e]); + event.symbol = this.symbolsForUrl(url); + event.color = this.colorForUrl(url); delete event.url; eventList.push(event); } From 83be49156f4cd3773c50daf0336f1063f7b9607c Mon Sep 17 00:00:00 2001 From: eouia Date: Thu, 6 Jul 2017 16:09:16 +0200 Subject: [PATCH 2/5] symbol and color for broadcasted events (calendar) - Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `defaultcalendar` module. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d25af7db..edfb8e01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed ### Added +- Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `defaultcalendar` module. ### Updated ### Fixed From 29bae230a4c6b11387fedd627107776e4dd4d897 Mon Sep 17 00:00:00 2001 From: eouia Date: Thu, 6 Jul 2017 16:09:49 +0200 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edfb8e01..389265bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed ### Added -- Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `defaultcalendar` module. +- Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `default/calendar` module. ### Updated ### Fixed From 551619e7724b1d7dce0a17b9035d7d7ea29cfcaf Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 8 Jul 2017 21:31:05 +0200 Subject: [PATCH 4/5] Fix issue #933 This is a fix for issue 933 which restores the original alligment of the analog clock; the analog clock still does not properly align to the left of the left sidebar when content of other left sidebar modules is too wide. --- CHANGELOG.md | 2 ++ modules/default/clock/clock_styles.css | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d25af7db..6b95e14d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Updated ### Fixed +- Fixed issue with incorrect allignment of analog clock when displayed in the center column of the MM + ## [2.1.2] - 2017-07-01 ### Changed diff --git a/modules/default/clock/clock_styles.css b/modules/default/clock/clock_styles.css index dd9eb0f8..1df9bf83 100644 --- a/modules/default/clock/clock_styles.css +++ b/modules/default/clock/clock_styles.css @@ -1,5 +1,5 @@ .clockCircle { - margin: 0; + margin: 0 auto; position: relative; border-radius: 50%; background-size: 100%; From db0bd3fa2ded2d4ed22670c304f3b7b0a0264bd9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 9 Jul 2017 11:45:57 +0200 Subject: [PATCH 5/5] Fix issue #940 Fix for issue 940 - time was incorrectly displayed in a 12-hour fashion regardless of the 24 hour clock preference in config.js --- modules/default/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 9ab864b9..672a47b3 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -81,7 +81,7 @@ Module.register("calendar", { case 24: { moment.updateLocale(config.language, { longDateFormat: { - LT: "hh:mm" + LT: "HH:mm" } }); break;