172 Commits

Author	SHA1	Message	Date
Michael Teeuw	3a9b154cb2	Fix code style issue.	2020-12-08 15:38:07 +01:00
Michael Teeuw	35a2839a2f	Merge branch 'develop' into customEvents	2020-12-08 15:21:29 +01:00
Johan Alvinger	97f3514677	Bugfix after Travis CI error (redeclaring variables)	2020-11-30 16:48:07 +01:00
Johan Alvinger	260bc9664e	Fixed variable redeclaration	2020-11-28 14:05:35 +01:00
Johan Alvinger	b735f8a524	New option "customEvents" ... Use custom symbol and/or color based on keyword in event titles	2020-11-28 13:17:14 +01:00
Johan Alvinger	1e34764588	coloredEvents should also color the symbol if that is displayed	2020-11-26 17:14:59 +01:00
Johan Alvinger	056f3a6ccb	limitDays and coloredEvents are now only module-wide options, not per calendar.	2020-11-24 15:41:28 +01:00
Johan Alvinger	21284e7795	Reverted change in calendarfetcher so events are limited to maximumEntries	2020-11-24 14:52:08 +01:00
Johan Alvinger	d8f19e631c	Fixed variable declarations to pass Travic CI check	2020-11-24 01:20:19 +01:00
Johan Alvinger	ce5c0ed5ba	Fixed typo in condition	2020-11-24 00:37:21 +01:00
Johan Alvinger	e86fa9d24a	Revised handling of timeFormat "absolute" and "relative". ... Added new option "coloredEvents" which contain an array with keyword and color for coloring events matching keyword	2020-11-23 21:48:34 +01:00
Johan Alvinger	a19c3a43d8	New option "limitDays" that will limit the number of days displayed.	2020-11-21 18:03:34 +01:00
Sam Detweiler	4a7cb88a3e	typo, remove dead code, comments, fix recurring refresh, let fetcher handle it	2020-10-12 09:01:50 -05:00
Sam Detweiler	a3bad8aec4	fix subsequent calendar fetcher timing	2020-10-11 22:39:42 -05:00
rejas	1d4d5cc4e7	Cleanup calendar jsdoc	2020-08-03 11:19:54 +02:00
rejas	8ce1e2c956	Cleanup calendar jsdoc	2020-07-30 12:54:39 +02:00
rejas	43bcf4ab98	Run eslint over files, see what gets fixed automatically and clean up	2020-07-27 14:25:43 +02:00
rejas	8b1d1671f7	Add test for changing the calendar symbol	2020-07-18 21:10:36 +02:00
rejas	a391445e5f	Add test setup for custom calendar configuration	2020-07-18 13:58:05 +02:00
rejas	ec2fedd797	Make sure default symbol is first from right-to-left	2020-07-17 18:00:27 +02:00
rejas	7489d19784	Merge calendar symbols	2020-07-17 18:00:27 +02:00
rejas	3b5a0e8d66	Added config option to calendar-icons for recurring- and fullday-events	2020-07-17 18:00:27 +02:00
chamakura	309a18e9c0	Fixing double conversion of time between UTC and local timezone	2020-07-04 20:12:34 -07:00
Michael Teeuw	cb1f65732e	Merge branch 'develop' into pr/wolfen351/2057	2020-07-04 21:15:14 +02:00
wolfen351	d5caadd906	Correct calendar display - account for current timezone	2020-06-27 19:43:09 +12:00
Veeck	8c319903dd	Cleanup outcommented logging	2020-06-02 15:03:59 +02:00
Michael Teeuw	4d21f8d022	Merge branch 'develop' into develop	2020-06-02 09:17:43 +02:00
Kristof Rado	a692d6be09	Reworked titleTransform.	2020-06-01 22:25:07 +02:00
Kristof Rado	efbb9648c4	Introduce new function for location title shortening.	2020-06-01 20:23:59 +02:00
Kristof Rado	3d73153e59	Revert "Renamed function" ... This reverts commit 6aa0a4a4	2020-06-01 20:19:03 +02:00
DarthBrento	8fa2256fb0	linted	2020-06-01 17:19:41 +02:00
DarthBrento	4fe974e7a8	Check identifier for type, too	2020-06-01 13:31:46 +02:00
DarthBrento	aeb287fa1d	Attach identifier to socket notifications to allow multiple instances	2020-06-01 13:12:54 +02:00
Kristof Rado	b179c8e2b7	Merge branch 'develop' into calendar-module	2020-05-29 23:50:24 +02:00
Kristof Rado	6aa0a4a47f	Renamed function	2020-05-29 23:50:01 +02:00
Kristof Rado	52aa8b868a	Truncate event title	2020-05-28 10:09:34 +02:00
Veeck	abb5dc5739	Run prettier over ALL files once ... No other changes done in this commit	2020-05-11 22:22:32 +02:00
Veeck	7fc7d626bc	Add Module to globals, cleanup comments	2020-05-05 14:55:15 +02:00
rejas	c04fa496bf	Second round of undef fixes	2020-05-03 18:59:26 +02:00
rejas	e7fc4ef1e7	Replace unsecure links with https ones	2020-04-28 23:05:28 +02:00
Veeck	ec187fe109	Update changelog and commen tags	2020-04-21 12:23:50 +02:00
rejas	d08bd4e866	Fix lots of warnings	2020-04-21 12:23:50 +02:00
rejas	941d5d7cd9	Fix mixed tabs and whitespace errors	2020-04-21 12:23:50 +02:00
Michael Teeuw	f7f4e92e0a	Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop	2020-04-01 09:58:55 +02:00
rejas	5a4ae99283	Add no-multi-spaces rule to eslint and run it	2020-03-15 15:49:34 +01:00
Michael Teeuw	561827e896	Remove logging.	2020-02-01 19:12:05 +01:00
Alexander Kraus	ecd79dc34b	Added a padding between days in dateheader mode	2019-12-20 15:20:12 +01:00
Veeck	36400c0a83	Fix some eslint errors from previous merges	2019-06-14 14:03:07 +02:00
Michael Teeuw	8ed77ba0c7	Merge	2019-06-14 13:31:59 +02:00
Matt Bauer	d41afa0e53	Calendar fetch error is still a loading result ... Also log error on node side as well.	2019-06-13 15:52:49 -05:00