44 Commits

Author SHA1 Message Date
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
Jens
4e47f9eb68 Added 'getRelative' tag 2016-09-03 23:37:09 +02:00
Jens
c4c8955bc2 Added 'getRelative' tag 2016-09-03 23:36:29 +02:00
Jens
bf5587fe09 Updated README.md
Fixed minor typo
2016-08-27 20:35:00 +02:00
Ashley M. Kirchner
9558616f59 Minor text changes, and updating README file 2016-05-10 11:58:05 -06:00
Ashley M. Kirchner
a4c02cef54 Absolute or Relative time display on Calendar module
User can now choose between an 'absolute' or 'relative time display on
events. Furthermore, when set to 'absolute', there's an option to set an
'urgency' range of days and only those events within that period will be
displayed with a relative time (in x days) while all others will have an
absolute date.
2016-05-10 01:01:00 -06:00
Mona Schüch
4e86de7fc2 calendar events repeating count title for birthdayd etc 2016-04-26 22:34:12 +02:00
djsunrise19
66e71282a0 Update README.md
Not necessary anymore, because we made that with "de.json" in calendar
2016-04-23 20:26:05 +02:00
Michael Teeuw
64e039cf8f Show 'tomorrow' when a full day event is planned for tomorrow. 2016-04-20 21:40:56 +02:00
Michael Teeuw
27a47d4e4a Show text when event is still running. 2016-04-15 13:13:06 +02:00
Michael Teeuw
598cf61eb4 Fix Facebook Birthdays - Fix: #97 2016-04-05 11:20:47 +02:00
Michael Teeuw
c4bfa6d4d8 Finish loading empty calendars. Fixes issue: #124 2016-04-05 10:01:54 +02:00
Michael Teeuw
5eed80c28e Squashed commit of the following:
commit e38dd346d9f796807ea71035c18e3533ec245ba6
Author: Michael Teeuw <michael@xonaymedia.nl>
Date:   Sat Apr 2 19:17:30 2016 +0200

    Add the possibility to set the maximum number of days.

commit 6f5c86775b708d19d3798267ffd23e491a1d2c62
Author: Sam Vendittelli <sam.vendittelli@hotmail.com>
Date:   Sat Apr 2 06:27:44 2016 +0100

    Fixed cursor appearing in margin

    Cursor was appearing in the margin so moved `cursor: none` property to html.

commit 576c668d84b34b8ad7a0fd51b146fde60f721682
Author: Domi-G <lessuseguy+githubdomig@gmail.com>
Date:   Fri Apr 1 22:52:32 2016 +0200

    Huge cleanup of white space
2016-04-03 19:52:13 +02:00
Michael Teeuw
e4c54cc655 Add module subfolder support. 2016-04-01 17:35:29 +02:00