324 Commits

Author	SHA1	Message	Date
Kyle Carson	14cc642e54	Support calendar-specific maximumEntries and maximumNumberOfDays	2017-01-30 16:26:42 -06:00
Michael Teeuw	c3bfaa31ee	Merge branch 'develop' into master	2017-01-30 20:55:53 +01:00
Rodrigo Ramírez Norambuena	cb71667336	Use jsonlint task to check translation files	2017-01-30 13:36:22 -03:00
Rodrigo Ramírez Norambuena	c75ee042a8	add e2e test enviroment	2017-01-30 12:36:11 -03:00
Rodrigo Ramírez Norambuena	d474d518ca	test e2e module helloworld	2017-01-30 12:24:49 -03:00
artifactdev	ed12deae25	Update CHANGELOG.md ... Added color options for calendar and weather forecast to changelog	2017-01-30 13:17:44 +01:00
Erik Pettersson	e738ee0812	Added information about the sv.json update.	2017-01-29 00:09:51 +01:00
Joseph Bethge	d3c0b9a438	fix module hidden status	2017-01-28 12:31:33 +01:00
Olexandr Savchuk	90616c82b6	Added console warning for deprecated config options	2017-01-27 18:02:50 +01:00
Rodrigo Ramírez Norambuena	de69fe1745	Show splash screen image on reboot and halt.	2017-01-27 13:42:20 -03:00
Michael Teeuw	ff6bd91ef7	Merge branch 'develop' into electron-issues	2017-01-27 09:01:57 +01:00
Rodrigo Ramírez Norambuena	86e553e756	Set configuration file by enviroment variable: ... Enable ability to set configuration file by the enviroment variable called MM_CONFIG_FILE.	2017-01-24 02:59:20 -03:00
Chris van Marle	b13c6f283a	Run npm test on Travis	2017-01-24 12:03:19 +01:00
Rodrigo Ramírez Norambuena	566ea9a110	Use script for start MagicMirror	2017-01-24 02:12:36 -03:00
Michael Teeuw	d9c7ee8976	Fixed Changelog to match the correct version.	2017-01-23 16:18:42 +01:00
Michael Teeuw	95cf554de4	Merge branch 'develop' into master	2017-01-23 16:17:28 +01:00
kthorri	5e860b6850	Added icelandic translation to changelog	2017-01-23 14:53:57 +00:00
Michael Teeuw	9758f3c9d2	Add the Hungarian translation.	2017-01-23 11:38:48 +01:00
Michael Teeuw	1f7863057f	Merge pull request #636 from Jopyth/fix_calendar ... Fix Calendar Issues	2017-01-22 16:10:31 +01:00
Michael Teeuw	3dd3afd21f	Update CHANGELOG.md	2017-01-22 12:23:11 +01:00
Joseph Bethge	63819c5757	fix calendar issues	2017-01-21 16:05:29 +01:00
Michael Teeuw	a967e73f9e	Merge branch 'develop' into fix_temperature_check	2017-01-19 20:03:13 +01:00
Tino Ziegler	56413ee94e	added fix	2017-01-18 16:04:02 +01:00
Michael Teeuw	03a4b8f5cf	Merge pull request #627 from tosti007/README_tables ... Replace HTML tables with Markdown tables	2017-01-17 17:23:27 +01:00
Michael Teeuw	a82fcce734	Merge branch 'develop' into tests	2017-01-17 17:22:37 +01:00
Brian	0734e136d0	Update CHANGELOG	2017-01-17 16:15:39 +01:00
Michael Teeuw	bd277b087a	Merge pull request #624 from tosti007/Calendar_Regex ... Add Regexp possibility to titleReplace	2017-01-17 11:07:42 +01:00
Brian	fc00966b8b	Update CHANGELOG	2017-01-17 11:05:18 +01:00
Michael Teeuw	6ea225ed2a	Rescale Splash Screen	2017-01-16 11:53:02 +01:00
Rodrigo Ramírez Norambuena	4cb3b514ab	update CHANGELOG test	2017-01-15 22:41:16 -03:00
Michael Teeuw	a4cb53fdb4	Show correct units for showRainAmount	2017-01-15 21:16:01 +01:00
Michael Teeuw	865dce6f68	Add info about issue #611.	2017-01-15 20:36:11 +01:00
Rodrigo Ramírez Norambuena	4c3dce694a	fix blackslash introduce in Pull Request #619 ... URL Pull Request: https://github.com/MichMich/MagicMirror/pull/619	2017-01-15 14:10:48 -03:00
Michael Teeuw	46d5b70391	Merge pull request #619 from nhubbard/develop ... Add postinstall script	2017-01-15 00:19:58 +01:00
Rodrigo Ramírez Norambuena	1cf8e08d4b	Changelog: fix number reference issue.	2017-01-14 19:37:38 -03:00
Nicholas Hubbard	5c4d1c0259	Add CHANGELOG.md	2017-01-14 15:37:32 -05:00
Michael Teeuw	2f7be0559a	Switch to rrule-alt. Issue: #565	2017-01-14 19:31:24 +01:00
Michael Teeuw	8ae946c2c5	Merge branch 'develop' into master	2017-01-12 19:46:34 +01:00
Michael Teeuw	bb75f6ffce	Merge pull request #601 from morozgrafix/russian_translations2 ... Russian translations2	2017-01-12 19:45:10 +01:00
Michael Teeuw	fcfe83f0cc	Merge pull request #599 from qistoph/hover ... Pass pointer-events on fullscreen overlay to underlaying modules	2017-01-12 19:44:46 +01:00
Michael Teeuw	5cbcded929	Merge branch 'develop' into russian_translations2	2017-01-12 19:42:50 +01:00
Michael Teeuw	fc06ffdcee	Merge branch 'develop' into master	2017-01-12 19:40:53 +01:00
Michael Teeuw	1601179081	Merge pull request #613 from roramirez/pm2_start ... Pm2 start	2017-01-12 19:39:03 +01:00
Alex Barcelo	ab9e0f891a	updating CHANGELOG	2017-01-12 17:35:04 +01:00
Courtney Pitcher	07d5b07748	Update Changelog.md	2017-01-11 21:48:33 +02:00
Courtney Pitcher	d47b9cd5c0	Merge branch 'develop' into master	2017-01-11 21:47:19 +02:00
IgniparousTempest	d542c063d7	Updated CHANGELOG.md to include Afrikkans translation	2017-01-11 21:42:31 +02:00
Thomas Bachmann	3ba16f1773	Merge remote-tracking branch 'MichMich/develop'	2017-01-11 11:32:20 +01:00
Sergey Morozov	544e7fce88	removing .gitignore changes and changelog notes about it	2017-01-10 11:05:37 -08:00
Michael Teeuw	f31049cf69	Merge branch 'develop' into fixdefmod	2017-01-10 19:52:20 +01:00