3865 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
flopp999	1bc0270d7b	Update forecast.njk ... change name of day to today and tomorrow	2020-10-11 09:36:52 +02:00
ashishtank	ebfeebc40b	Merge pull request #4 from MichMich/develop ... Merge from Develop	2020-10-07 15:58:47 +02:00
Michael Teeuw	ec80b25087	Merge pull request #2150 from sdetweil/fixparse ... add error handler to json parsing of translation files	2020-10-06 10:23:46 +02:00
Michael Teeuw	7a2278d7b6	Merge branch 'develop' into fixparse	2020-10-06 10:23:34 +02:00
Michael Teeuw	28b93b70fa	Merge pull request #2152 from sdetweil/new_cal ... update calendar handler code for rrule and daylight/standard time adjustments	2020-10-06 10:19:58 +02:00
Michael Teeuw	0431f45190	Merge branch 'develop' into new_cal	2020-10-06 10:16:08 +02:00
Michael Teeuw	96ce444061	Merge pull request #2154 from sdetweil/fixical ... fix node-ical version	2020-10-06 10:15:10 +02:00
sam detweiler	32776e7ca3	Merge branch 'develop' into fixparse	2020-10-05 13:11:55 -05:00
sam detweiler	35d516ad4d	Merge branch 'develop' into new_cal	2020-10-05 13:11:11 -05:00
sam detweiler	e6a17d27b9	Merge branch 'develop' into fixical	2020-10-05 13:10:25 -05:00
Sam Detweiler	52edec1b64	fix wrong node-ical version requested, package.json	2020-10-05 12:59:30 -05:00
Sam Detweiler	6440d2289c	fix translation files with comments crashing UI	2020-10-05 12:58:10 -05:00
Sam Detweiler	11afadcea8	fix RRULE bad date and add Windows Timezone name support	2020-10-05 12:56:25 -05:00
Sam Detweiler	2e981987f2	resolve conflict	2020-10-05 11:06:21 -05:00
Sam Detweiler	69efca0bdb	use Log.error instead of console.log for error message, shows in output	2020-10-05 10:45:07 -05:00
Sam Detweiler	eefb92367e	fix node-ical version	2020-10-05 10:02:29 -05:00
Sam Detweiler	8fa96c2836	add error handler to json parsing of translation files	2020-10-04 12:13:08 -05:00
Sam Detweiler	04dae52a6c	correct daylight/standard adjustments, windows timezones and east of london rrule bug	2020-10-04 12:10:19 -05:00
Ashish Tank	37c9da1351	Merge branch 'develop' of https://github.com/ashishtank/MagicMirror into develop	2020-10-02 22:01:50 +02:00
ashishtank	86d7ec6270	Merge pull request #3 from MichMich/develop ... Sync with Develop	2020-10-02 18:06:24 +02:00
Ashish Tank	82f1e0fe32	Added Hindi and Gujarati languages	2020-10-02 17:51:41 +02:00
Michael Teeuw	6ec0aa8894	Prepare 2.14.0-develop	2020-10-01 12:19:57 +02:00
Michael Teeuw	3dbe8bfbbf	Merge pull request #2143 from MichMich/develop ... Release 2.13.0 v2.13.0	2020-10-01 12:13:38 +02:00
Michael Teeuw	20d82bab78	Prepare 2.13.0	2020-10-01 11:55:18 +02:00
Michael Teeuw	60f6123b64	Merge pull request #2139 from sdetweil/develop ... restore ical for 3rd party modules	2020-09-29 17:45:49 +02:00
Sam Detweiler	74887a58f6	remove regression on event duration	2020-09-29 10:33:51 -05:00
Sam Detweiler	76821d16fc	restore ical for 3rd party modules	2020-09-24 10:13:25 -05:00
Michael Teeuw	233a6b5e90	Merge pull request #2137 from rejas/md ... Update Changelog and Licsense file	2020-09-22 16:16:22 +02:00
Michael Teeuw	a1d9337c81	Merge pull request #2136 from sdetweil/develop ... fix package.json	2020-09-22 16:16:08 +02:00
rejas	e3fec6c3e4	Update Changelog and License	2020-09-22 15:47:16 +02:00
Sam Detweiler	5de88b4cc1	remove added lodash	2020-09-22 08:40:40 -05:00
Sam Detweiler	af5e6655e0	fix pull	2020-09-22 08:38:15 -05:00
Sam Detweiler	a8716799c9	fix dependency versioning error	2020-09-22 08:33:21 -05:00
Michael Teeuw	1672027091	Merge pull request #2135 from sdetweil/develop ... update to node-ical, handle MS timezones and timezones in general in cal entries	2020-09-22 14:55:27 +02:00
sam detweiler	934ac886cb	Merge branch 'develop' into develop	2020-09-22 07:49:19 -05:00
sam detweiler	1b47c4d16f	add package-lock	2020-09-22 07:31:02 -05:00
sam detweiler	e8fd906aa1	move calendar to node-ical for ms timezones and timezones in general	2020-09-22 07:25:48 -05:00
Michael Teeuw	57b6ea1297	Merge pull request #2134 from bugsounet/patch-1 ... New ConfigMerge code purpose	2020-09-22 10:54:35 +02:00
bugsounet	102ff15a99	Checking formatting... ... All matched files use Prettier code style!	2020-09-22 00:26:24 +02:00
Cédric	19148cfc84	Update loader.js	2020-09-22 00:04:05 +02:00
Cédric	97c2bab58a	apply ConfigMerge() if configDeepMerge: true	2020-09-21 23:21:43 +02:00
Cédric	1f473228ce	New purpose for configMerge()	2020-09-21 23:17:41 +02:00
Cédric	340a8e4176	(test react for in my repo)	2020-09-21 22:36:54 +02:00
Michael Teeuw	67201a52cc	Merge pull request #2016 from Travelbacon/develop ... Changed "Gevoelstemperatuur" to "Voelt als". This is shorter and save…	2020-09-21 12:48:09 +02:00
Michael Teeuw	30e164fe0a	Fix merge conflict.	2020-09-21 12:21:08 +02:00
Michael Teeuw	cfcb20a468	Merge pull request #2133 from rejas/dependencies ... Cleanup dependencies	2020-09-21 12:18:37 +02:00
Joris	24eac7ef41	For the mergne	2020-09-20 20:57:20 +02:00
ashishtank	94162f1b45	Merge pull request #1 from MichMich/develop ... Catching up on 19th Sep 2020	2020-09-19 17:20:35 +02:00
rejas	01c19efc0c	Update CHANGELOG	2020-09-19 12:30:17 +02:00
rejas	e4f2a8a23b	Update dependencies	2020-09-19 12:25:11 +02:00