2801 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Teeuw	a4db0e40e3	Merge pull request #1815 from sdetweil/newservermode ... fix regression and add support for commented lines in config.js	2019-12-29 00:01:23 +01:00
Michael Teeuw	305b55cb2a	Merge pull request #1814 from sdetweil/newscripts ... updates for libc6++ on pi 0, node 10	2019-12-29 00:00:03 +01:00
Sam Detweiler	272ca1ac4f	synch package-lock.json for testing	2019-12-28 15:46:10 -06:00
Sam Detweiler	bbc6a1b38f	synch package-lock for testing	2019-12-28 15:39:57 -06:00
Michael Teeuw	0e93713464	Merge pull request #1826 from sdetweil/fixcompliments ... Fix compliments to support \n	2019-12-28 22:01:16 +01:00
sam detweiler	8f60e103f9	Merge branch 'develop' into fixcompliments	2019-12-28 14:58:01 -06:00
Michael Teeuw	9cc702241d	Merge pull request #1827 from sdetweil/fix_helper ... Fix helper being erased accidentally	2019-12-28 21:44:10 +01:00
sam detweiler	0d61c44232	Merge branch 'develop' into newscripts	2019-12-28 14:42:06 -06:00
sam detweiler	9a8faac316	Merge branch 'develop' into fix_helper	2019-12-28 14:36:49 -06:00
Michael Teeuw	05f710cb5c	Merge pull request #1838 from tbouron/fix/module-header ... Module header updates correctly, if a module need to dynamically show/hide its header based on a condition	2019-12-28 19:41:42 +01:00
Michael Teeuw	c6184769e7	Merge pull request #1836 from akraus53/patch-2 ... Added a padding between days in dateheader mode	2019-12-28 19:41:15 +01:00
Michael Teeuw	515d1bd920	Merge branch 'develop' into fixcompliments	2019-12-28 19:38:18 +01:00
Michael Teeuw	b19cb17bba	Merge branch 'develop' into newservermode	2019-12-28 19:37:41 +01:00
Michael Teeuw	c1e808bce6	Merge pull request #1806 from sdetweil/newElectron ... New electron version	2019-12-28 19:35:57 +01:00
Thomas Bouron	d8b7292d4b	Fix module header update if using customising from module.getHeaders()	2019-12-26 14:07:13 +00:00
Sam Detweiler	edd5e2f5bc	move lxsession screensaver checking to last, some systems still have the folder but don't use it	2019-12-24 06:55:12 -06:00
Alexander Kraus	efc6cb73b2	Added my contribution to the changelog	2019-12-20 15:22:14 +01:00
Alexander Kraus	ecd79dc34b	Added a padding between days in dateheader mode	2019-12-20 15:20:12 +01:00
sam detweiler	5279995c3b	Merge branch 'develop' into newservermode	2019-12-13 08:03:06 -06:00
Sam Detweiler	5176b06b59	add check for root user and abort	2019-12-13 08:01:32 -06:00
Sam Detweiler	ed61ac624d	http default if no address is 0.0.0.0, not localhost, hard code localhost as per readme	2019-12-10 12:15:30 -06:00
Sam Detweiler	4da6e3ecee	add test for error on 200 rc test path	2019-12-10 11:29:26 -06:00
Sam Detweiler	9e5561936a	Merge branch 'newElectron' of https://github.com/sdetweil/MagicMirror into newElectron	2019-12-10 10:54:18 -06:00
Sam Detweiler	843cd0eff6	change spectron version to match doc, update locak file	2019-12-10 10:53:41 -06:00
sam detweiler	6b6ee934a1	Merge branch 'develop' into newElectron	2019-12-10 08:31:50 -06:00
Sam Detweiler	aea57ffaf4	add new run_start.sh script	2019-12-10 08:29:18 -06:00
Sam Detweiler	87b48661fa	remove forced npm install	2019-12-09 16:41:56 -06:00
Sam Detweiler	556fa44858	move travis to node 10 , latest npm	2019-12-09 16:26:49 -06:00
Sam Detweiler	1c3e196508	move travis to node 10 and latest npm	2019-12-09 16:24:16 -06:00
Sam Detweiler	9b6812ad0c	add package-lock file	2019-12-09 11:15:50 -06:00
Sam Detweiler	b7944c7fa4	add changelog	2019-12-09 10:36:21 -06:00
Sam Detweiler	2fbedca746	stop helper class being erased	2019-12-09 10:33:35 -06:00
Sam Detweiler	340d04a48c	add changelog entry	2019-12-09 09:52:15 -06:00
Sam Detweiler	460a383ffc	add changelog	2019-12-09 09:46:45 -06:00
Sam Detweiler	52c4e3a256	add changelog update	2019-12-09 09:43:32 -06:00
sam detweiler	4338f11eb1	Merge branch 'develop' into newscripts	2019-12-09 09:40:06 -06:00
Sam Detweiler	42bab052e0	fix comment	2019-12-08 10:07:55 -06:00
Sam Detweiler	0cb377618e	add support for sequential compliments usage	2019-12-08 09:28:50 -06:00
Sam Detweiler	5e4d25b957	add support for newline (\n) in compliment text	2019-12-08 08:50:00 -06:00
Sam Detweiler	153d1853fa	add apt get upgrade to actually upgrade files, as OS repos are lagging	2019-12-08 08:46:41 -06:00
Sam Detweiler	22a3448461	latest fixes for install and pm2	2019-12-08 08:40:01 -06:00
Sam Detweiler	2cad869680	latest fixes for install and pm2	2019-12-08 08:35:50 -06:00
Your Name	bc912a8ea4	Merge branch 'newscripts' of https://github.com/sdetweil/MagicMirror into newscripts	2019-11-27 08:38:12 -06:00
Your Name	db9176c284	fix pm2 install needing sudo	2019-11-27 08:37:51 -06:00
Sam Detweiler	06308210c0	add support for secured apt-get repositories	2019-11-23 06:57:10 -06:00
Sam Detweiler	63d9904370	regression checking for macOS	2019-11-22 06:30:46 -06:00
Sam Detweiler	caaeff5cb7	add support for commented lines in config.js	2019-11-22 06:22:21 -06:00
Sam Detweiler	d8c93d3455	Merge branch 'newscripts' of https://github.com/sdetweil/MagicMirror into newscripts	2019-11-22 06:18:31 -06:00
Sam Detweiler	cb28e5fddc	watch out for commented lines in config	2019-11-22 06:18:04 -06:00
Sam Detweiler	7d7ec1a00b	updates for libc6++ on pi 0, node 10	2019-11-21 22:32:48 -06:00