kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-04 06:46:05 +00:00
Code Issues Projects Releases Wiki Activity
2,481 Commits 3 Branches 50 Tags
Commit Graph

63 Commits

Author SHA1 Message Date
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
Andrew McOlash
399e171083 Add in cutting of long vertical titles 2019-01-16 22:51:44 -08:00
Michael Teeuw
ed617c5943
Merge pull request #1485 from djgalloway/wip-endtime 
Document endTime variables
 2018-12-30 15:42:04 +01:00
David Galloway
d0195e0509 Document endTime variables 
Missed docs in 188aa14d82

Signed-off-by: David Galloway <dgallowa@redhat.com>
 2018-12-20 11:40:50 -05:00
Thomas Bachmann
d923ae2107
Merge branch 'develop' into develop 2018-10-29 20:30:37 +01:00
Michael Teeuw
51fbff1a4a
Merge branch 'develop' into addClassCellCalendar 2018-10-26 15:14:17 +02:00
Dustin
db79e1271e
(doc) showEnd config 
Add documentation for showEnd configuration
 2018-10-08 21:11:28 +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
Thomas Bachmann
007b2f0c88 Allow to parse recurring calendar events where the start date is before 1900 
Some birthday calendar events have a start date before 1900.
 2018-10-03 22:43:29 +02:00
Teddy Payet
ed4d17f578 README updated 
Update of README for the new option.
 2018-06-11 16:41:08 +02:00
Kenn Breece
70dccff293 Add regex filtering to calendar module 2018-06-03 21:12:31 -04:00
Michael Teeuw
c4dee3dd8d
Merge pull request #1293 from derRAV3N/patch-1 
Add note to README.md
 2018-05-22 15:27:03 +02:00
derRAV3N
091e024032
Add note to README.md 
Add note to README.md to not add calendars that have entries before 1st January 1970.
 2018-05-22 15:14:05 +02:00
=
e492012004 fix missing s on timeFormat 2018-05-09 22:36:53 -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
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
Kenn Breece
be0f262e37 Add advanced filtering to excludedEvents 2018-03-18 23:54:23 -04:00
retroflex
ba63a44ec8 Added option to set a separate date format for full day events. 2017-04-28 23:31:07 +02:00
Andrew McOlash
63ae2b8095 Add in ability to wrap calendar events to multiple lines 2017-04-02 15:06:58 -05:00
Rodrigo Ramírez Norambuena
0d3c03d1e3 Restore code removed on Merges on 2017-03-17 2017-03-17 22:36:21 -03:00
Michael Teeuw
b4dfce4a44 Merge branch 'fewieden-calendar-multiple-icons' into develop 2017-03-17 15:37:40 +01:00
Michael Teeuw
91ca3939b3 Fix Merge Conflicts 2017-03-17 15:36:55 +01:00
Andrew McOlash
4d3b6b1486 Merge remote-tracking branch 'upstream/develop' into excluded_events 2017-03-17 07:25:42 -05:00
fewieden
ccb81179ab fix config option 2017-03-16 16:57:55 +01:00
Andrew McOlash
5466e1b733 Remove unnecessary string from excluded array 2017-03-12 20:22:40 -05:00
Andrew McOlash
5df818a19c Add in support to hide and exclude events based on a filter 2017-03-12 11:36:40 -05:00
Beh
9848f80630 Added support for more authentication methods for the default calendar module 
HTTP Basic, Digest and OAuth2/Bearer authentications are now supported
by the calendar module
 2017-03-07 00:12:43 +01:00
Rodrigo Ramírez Norambuena
d97571ce0c Fix tab documentacion calendar for colored option 2017-03-06 02:11:27 -03:00
Kyle Carson
9f659eef1b Fix formatting 2017-01-30 16:35:21 -06:00
Kyle Carson
14cc642e54 Support calendar-specific maximumEntries and maximumNumberOfDays 2017-01-30 16:26:42 -06:00
Jeremias Arnstadt
e249092f91 used mardown in calendar README 2017-01-29 11:17:00 +01:00
Jeremias Arnstadt
bc257f4951 Merge branch 'develop' of https://github.com/artifactdev/MagicMirror 
# Conflicts:
#	modules/default/calendar/README.md
#	modules/default/weatherforecast/README.md
 2017-01-29 00:53:07 +01:00
Jeremias Arnstadt
4214293b76 updated README of weatherforecast and calendar module for color options 2017-01-28 18:32:06 +01:00
Rodrigo Ramírez Norambuena
422349c2d1 Change of examples configuration in README modules. 
This change is related commit f59f035a7ec5e64ab9e629521b39a548a6430b8b
Now is used  grunt for check ESLint syntax validation of config/* files
 2017-01-24 17:22:17 -03:00
Brian
2913120ff7 Update README files 2017-01-17 16:14:50 +01:00
Rodrigo Ramírez Norambuena
19d906c5e4 fix tabs, remove extra spaces and lines. 2016-12-29 22:23:08 -03:00
Daniel Buecheler
a12a4cd8f2 Merge remote-tracking branch 'mich/develop' into hidePrivate 
Resolved merge conflict
 2016-12-22 21:53:47 +01:00
Andreas
de71b1b397 Revert calendar default value and add documentation 2016-12-13 17:16:46 +01:00
Andreas
21bf1dd1a3 Updated module READMEs with current default values 2016-12-12 14:52:00 +01:00
Daniel Bücheler
c66ecbdd29 Added hidePrivate to README.md 
Added explanation of hidePrivate option to the Calendar Module's README
 2016-11-30 21:28:44 +01:00
Rodrigo Ramírez Norambuena
07a86800c9 calendar: little fix format README 2016-11-12 21:10:37 -03:00
Chris van Marle
9fd81bf6c7 Add dateFormat to calendar module 2016-11-10 17:26:29 +01:00
Michael Teeuw
5858e862d9 Broadcast calendar eventlist to other modules. 2016-10-14 15:23:03 +02:00
Michael Teeuw
29d87d7c48 Merge branch 'patch-4' of https://github.com/yo-less/MagicMirror into yo-less-patch-4 
# Conflicts:
#	CHANGELOG.md
 2016-10-01 11:03:05 +02:00
Robin Appelman
90207f9b68 add support for http basic auth for calendars 2016-09-08 21:29:17 +02:00
Jens
0ff4884d3a Added 'getRelative' tag 2016-09-03 23:42:24 +02:00
Jens
2dfdedf7b0 Update README.md 2016-09-03 23:40:29 +02:00
Jens
e1fa5fb180 Added 'getRelative' tag 2016-09-03 23:39:32 +02:00