238 Commits

Author	SHA1	Message	Date
sam detweiler	3d6485588d	pr merge order left electron in dependencies section	2019-10-25 07:37:21 -05:00
Michael Teeuw	ecdd9734eb	Merge branch 'develop' into newservermode	2019-10-25 14:23:50 +02:00
Sam Detweiler	e958f33450	add support for armv6l using serveronlymode, make serveronly config option, electron install optional	2019-10-24 09:20:33 -05:00
Chris van Marle	a6aae70a55	Add UTC timestamp to console log	2019-10-23 10:16:01 +00:00
Michael Teeuw	1ff51822df	Prepare 2.10.0-develop	2019-10-01 19:47:40 +02:00
Michael Teeuw	d90de18d99	Prepare 2.9.0	2019-10-01 19:36:51 +02:00
fewieden	ec6d9e3521	Merge branch 'develop' into feature/automated-weather-tests ... # Conflicts: # modules/default/weather/weather.js # package-lock.json # package.json	2019-09-11 13:07:31 +02:00
Rodrigo Ramírez Norambuena	2822303138	Skip from worktree the css/custom.css: ... On the next release the css/custom.css will rename to css/custom.css.sample This change run git instructions to detach the file from own local repository. This instructions are called in untrack-css.sh file from run-start.sh and npm postinstall step Reference #1540	2019-07-26 02:12:10 -04:00
Michael Teeuw	00148b4cc8	Prepare 2.9.0-develop	2019-07-01 20:22:52 +02:00
Michael Teeuw	7d58eb718e	Prepare release 2.8.0	2019-07-01 19:06:26 +02:00
Michael Teeuw	8ed77ba0c7	Merge	2019-06-14 13:31:59 +02:00
Michael Teeuw	7a272ef0ab	Merge conflict.	2019-06-14 13:19:29 +02:00
Matt Bauer	a6284e05e5	Update rrule and request dependencies for calendar’s vendored ical.js ... rrule-alt has not been updated in some time, while the main rrule has. ical.js is using updated rrule. Getting rid of rrule-alt would affect some third-party modules, however, so we should keep it around for now at least.	2019-06-13 14:45:32 -05:00
rejas	63b9c0e6b8	More dependency updates and cleanup of old ones	2019-06-05 16:54:32 +02:00
rejas	84893b1664	Upgrade markdown lint to latest	2019-06-05 10:26:20 +02:00
rejas	cac92da6e4	Remove unused dependency, move mocha-logger to dev	2019-06-04 10:13:58 +02:00
Malcolm Oakes	7742575cab	Merge latest from develop branch	2019-04-03 16:16:59 +01:00
Malcolm Oakes	c80e04fe8d	Add new weather data provider UK Met Office (Datapoint)	2019-04-03 15:19:32 +01:00
Michael Teeuw	8b0b70e757	Prepare 2.8.0-develop.	2019-04-02 09:55:20 +02:00
Michael Teeuw	abb0dadead	Fix package.json version number.	2019-04-02 09:34:42 +02:00
Michael Teeuw	43ba13f3bc	Prepare 2.8.0-develop.	2019-04-01 21:26:39 +02:00
Michael Teeuw	b0d97dd170	Prepare for release.	2019-04-01 20:47:07 +02:00
fewieden	fa8e398e90	dependencies	2019-01-13 23:50:29 +01:00
Michael Teeuw	e1fe8d1d89	Bump Electron to v3.0.13 - Issue: #1500	2019-01-03 16:04:33 +01:00
Michael Teeuw	b52da7c9fc	Prepare for 2.7.0 dev branch.	2019-01-01 17:15:37 +01:00
Michael Teeuw	e70e011a9c	Add dependency.	2019-01-01 16:57:16 +01:00
Michael Teeuw	874d79be36	Upgrade Electron to 2.0.16	2019-01-01 16:33:59 +01:00
Michael Teeuw	b33663c9f8	Prepare for release 2.6.0.	2019-01-01 15:52:29 +01:00
Michael Teeuw	24e15c0568	Add ajv dependency to fix linting error.	2018-12-19 16:04:52 +01:00
Thomas Bachmann	d923ae2107	Merge branch 'develop' into develop	2018-10-29 20:30:37 +01:00
Teddy Payet	332b54e7a5	Merge branch 'develop' of https://github.com/MichMich/MagicMirror into addClassCellCalendar	2018-10-04 02:02:20 +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
Michael Teeuw	d4fe01f9b9	Prepare for 2.6.0-dev.	2018-10-01 08:20:15 +02:00
Michael Teeuw	9a46081d0b	Prepare for release 2.5.0	2018-09-30 21:36:04 +02:00
Teddy Payet	5eb0b77a8a	Merge upstream/develop	2018-09-08 23:40:39 +02:00
Michael Teeuw	f01e7b7e20	Prepare for 2.5.0	2018-07-04 11:32:04 +02:00
Michael Teeuw	ef5ea93de1	Prepare for release 2.4.1	2018-07-04 11:20:37 +02:00
Michael Teeuw	1f76bd1942	Setup the next release (2.5.0).	2018-07-01 21:01:41 +02:00
Michael Teeuw	0b2d1564ef	Prepare to release 2.4.0	2018-07-01 20:43:04 +02:00
Michael Teeuw	889af461c6	Upgrade to Electron 2.0.0.	2018-05-11 16:23:43 +02:00
Michael Teeuw	ee7bd73b3f	Merge branch 'develop' into master	2018-04-06 14:39:04 +02:00
Michael Teeuw	d21d9f0141	Use Electron 2 Beta.	2018-04-06 13:21:53 +02:00
Sebastian Limbach	cea744a914	Remove yarn-or-npm	2018-04-03 19:38:00 +02:00
Michael Teeuw	27cac4e8b8	Merge v2.3.1	2018-04-01 19:17:08 +02:00
Michael Teeuw	eaaa62a7f3	Downgrade Electron.	2018-04-01 19:05:38 +02:00
Michael Teeuw	6ce732ec3d	Preparation for v2.4.0.	2018-04-01 14:23:28 +02:00
Michael Teeuw	be29b5daf8	Prepare for release 2.3.0	2018-04-01 14:08:38 +02:00
Dominic Dey-Marckmann	c93b263b1f	Update electron to 1.7.13	2018-03-27 21:09:08 +02:00
Marek Lukáš	9974e35656	Added yarn support	2018-03-12 15:28:43 +01:00
fewieden	305d60e09b	translator unit tests	2018-02-10 12:32:43 +01:00