kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity
2,483 Commits 3 Branches 49 Tags
Commit Graph

113 Commits

Author SHA1 Message Date
Jon Kolb
868b5e4617 Add name property to calendars 
When consuming CALENDAR_EVENTS broadcasts, it is useful for other
modules to be able to identify which calendar a specific event
came from, for filtering/display purposes.
 2019-03-26 19:51:44 -04:00
hudashot
d3b8dbeea0 Regularly trigger ADD_CALENDAR to ensure calendar fetcher is running 2019-02-26 08:12:02 +00:00
Michael Teeuw
b169d65619
Merge pull request #1577 from sdetweil/develop 
fix relative date fulldate events to use start of day to start of day diff… issue 1572
 2019-02-19 15:47:57 +01:00
Sam Detweiler
ea5d8590d5 Merge branch 'develop' of https://github.com/sdetweil/MagicMirror into develop 2019-02-19 07:08:46 -06:00
sam detweiler
5d5feb4c71
Merge pull request #1 from MichMich/develop 
Develop
 2019-02-19 07:08:13 -06:00
Dirk
feb5351ec3
changed default calendarEndDate to "LT" 
changed default calendarEndDate to "LT" to show local times for event end times. 
Can still be set to a different value by the user
 2019-02-19 14:07:01 +01:00
Sam Detweiler
7630c25ef3 add future date offset correction for emergency date values in absolute mode 2019-02-19 07:06:22 -06:00
Dirk
2b2e8508d9
Update calendar.js 
Small updates for travis cr check
 2019-02-18 22:38:28 +01:00
Dirk
a70716f225 Merge branch 'splitDates' of https://github.com/lavolp3/MagicMirror into splitDates 2019-02-18 21:11:58 +01:00
Dirk
d9fcc46994 included split function to split multiday events 2019-02-18 21:11:24 +01:00
Sam Detweiler
9686a9ba77 fix relative date fulldate events to use start of dat to start of day difference 2019-02-18 07:18:07 -06:00
Andrew McOlash
a0dde39d97 Fix braces for if check 2019-01-21 00:47:53 -08:00
Andrew McOlash
320743ab8d fix spacing 2019-01-16 22:53:28 -08:00
Andrew McOlash
399e171083 Add in cutting of long vertical titles 2019-01-16 22:51:44 -08:00
Jan Syring-Lingenfelder
1c83059482 fix: only show repeating count if the event is actually repeating 2019-01-13 16:18:52 +01:00
Ian
0092289105 revert font awesome reference 2019-01-09 21:38:07 +00:00
Dirk
af459a5a28
formatting corrected 
Corrected formatting due to Travis CI errors
 2018-11-21 12:10:39 +01:00
Dirk
cc96b86b3a
Fading for dateheaders 
Included fading for dateheaders option
Removed unnecessary switch statement in dateheaders option
 2018-11-21 09:32:56 +01:00
Michael Teeuw
4fd87aca09 Change showEnd default to false. 2018-10-26 15:22:05 +02:00
Michael Teeuw
51fbff1a4a
Merge branch 'develop' into addClassCellCalendar 2018-10-26 15:14:17 +02:00
P-DESK\P-Storm
fc89feec4e * Added font awesome 5, keeping shims in place for the calendar app (https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4) 
* Updated example sample config
 2018-10-05 01:16:25 +02:00
Teddy Payet
3b48f1d042 - Possibility to add classes to the cell of symbol, title and time of the events of calendar. 2018-10-04 02:07:08 +02:00
vlb
188aa14d82 added support for showing end of events in calendar 2018-08-28 18:11:38 +02:00
vlb
7c579cf7b7 added support for showing end of events through config parameters showEnd and dateEndFormat 2018-08-28 17:35:53 +02:00
Elan Trybuch
facfa73214
Merge branch 'develop' into rp-zero-w-es6-fix 2018-08-16 12:07:38 -04:00
Elan Trybuch
d4ec4795c3 Fix ES6 syntax bug on RaspberryPi Zero W 
Following this issue https://github.com/MichMich/MagicMirror/issues/694 it seems that the Midori Browser does not recoginize ES6 syntax. Further, the use of 'var' is seen throughout the calendar module excpet on line 439, where the error is reported
 2018-08-16 11:45:34 -04:00
Janne Kalliola
c9577bcdc5 Added an if to use absolute dates with all events 2018-08-05 19:47:27 +03:00
Teddy Payet
afd829307d Tabs and spaces from the original files 
With a diff, here the orginal tabulations.
 2018-06-11 23:09:00 +02:00
Teddy Payet
09abdc0f12 ESLint format 
Resolve format ith eslint
 2018-06-11 19:59:21 +02:00
Teddy Payet
cbc2eaf908 Customize classes for table 
MagicMirror offers helper classes in the main.css. Therefore, we give
the possibility to indicate the class that we want.
 2018-06-11 12:54:27 +02:00
=
c6bf69cce4 fix linting errors. add line to changelog 2018-05-10 19:54:01 -04:00
=
94c46f9881 New calendar display format with date headers for days and times listed next to events for that date 
IE:

Sunday, May 1st
  2:00 pm       Soccer
  4:00 pm       Basketball
 2018-05-09 22:32:15 -04:00
Parnic
173499f496
Fixed coloredSymbolOnly 2018-05-05 08:31:58 -05:00
Brian Johnson
8053256203 Added option to calendar module that colors only the symbol instead of the whole line 2018-04-27 11:06:45 -05:00
Janne Kalliola
30c5d78647 Support for hiding on-going events 2018-04-08 14:57:28 +03:00
reeno
80a9d40a44
fixed width Font Awesome symbols 
See http://fontawesome.io/examples/#fixed-width
 2017-11-25 12:08:40 +01:00
Chris van Marle
664196c5ef Fix some trailing whitespace grunt errors 2017-10-12 10:23:40 +02:00
Andreas Cederström
2d03ff63cf Slice the list of all events to honor config.maximumEntries 
Scenario:
* Specify more than one calendar in `config.calendars`
* Specify a maximum number of entries in `config.maximumEntries`

Result:
The module will show as many as maximumEntries for EACH calendar

Expected:
The module shall not show more than a total of maximumEntries, regardless of how many calendars I specify

Fixes #1043
 2017-10-01 21:47:10 +02:00
Rodrigo Ramírez Norambuena
4bd36fc29e Merge branch 'develop' into deprecation-warning 2017-08-13 04:28:06 -03:00
Bas van Wetten
e0414e4eb9 Add unittest for calendar module 
Add unittest for 'getLocalSpecification' function.
 2017-07-31 22:36:14 +02:00
Michael Teeuw
18b61e35be Merge branch 'develop' into unittest-calendar 2017-07-31 15:04:16 +02:00
Rodrigo Ramírez Norambuena
06af327e5e Added deprecation warning for authentication of the calendar module. 
Discussed in Review
9848f80630 (r105531731)
 2017-07-30 22:56:27 -04:00
Bas van Wetten
35e3b889c3 Add new unit tests 
Add new unit tests for 'shorten' function in calendar module
 2017-07-29 16:02:53 +02:00
Bas van Wetten
b89ee67daf Merge branch 'fix-issue-961' into fix-issue-963 2017-07-28 21:33:10 +02:00
Bas van Wetten
7bd256c311 Fix calendar.js bug issue #963 
Fixed calendar specific configuration settings maximumEntries and maximumNumberOfDays not overriding global setting
 2017-07-28 21:07:38 +02:00
Bas van Wetten
4add7cd0b3 Fix calendar.js bug 
Fix bug where excludedEvents count towards maximumEntries displayed
 2017-07-28 17:47:22 +02:00
Michael Teeuw
c492ea77f1 Merge pull request #943 from QNimbus/fix-issue-940 
Fix issue #940
 2017-07-12 10:55:43 +02:00
Unknown
db0bd3fa2d 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
 2017-07-09 11:46:59 +02:00
eouia
561ae102fb add symbol and color on broadcasted events 2017-07-06 11:57:16 +02:00
Unknown
3404ebbbb8 Calender respects timeformat 
In reference to issue #776, made changes to calendar.js to respect timeformat config option if it is used
 2017-06-26 14:43:40 +02:00