2029 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
E:V:A	07e4b26b9e	Added general advice	2018-01-06 19:57:46 +02:00
Michael Teeuw	b63aa62985	Merge pull request #1121 from henrikra/master ... Add basic typescript types for module	2018-01-06 14:29:52 +01:00
Henrik Raitasola	ca701c0580	Merge branch 'master' of github.com:henrikra/MagicMirror	2018-01-06 15:26:51 +02:00
Henrik Raitasola	e37043a6a8	Solve conflict	2018-01-06 15:26:38 +02:00
Michael Teeuw	7c26975d14	Merge branch 'develop' into master	2018-01-06 14:16:21 +01:00
Henrik Raitasola	47f8a43637	Add changelog	2018-01-06 15:10:10 +02:00
Henrik Raitasola	1238c0cefe	Rename file to be more explicit	2018-01-06 15:06:58 +02:00
Henrik Raitasola	4c35fda045	Add most used module properties	2018-01-06 15:04:54 +02:00
Henrik Raitasola	780124c2f5	Add basic types to get started	2018-01-06 14:51:32 +02:00
Michael Teeuw	38e0af41ce	Merge pull request #1116 from ConnorChristie/async-dom ... DOM creation notifications in cases of async template rendering	2018-01-04 21:51:13 +01:00
Connor Christie	601e99eec0	Merge branch 'develop' into async-dom	2018-01-02 18:10:07 -06:00
Connor Christie	745a2adee7	Merge branch 'develop' into async-dom	2018-01-02 18:08:55 -06:00
Connor Christie	9e83234df1	Update changelog	2018-01-02 18:06:21 -06:00
Connor Christie	e45eeadf7d	Merge remote-tracking branch 'origin/master' into async-dom	2018-01-02 18:04:03 -06:00
Michael Teeuw	9a778cea6b	Merge v2.2.2 changes.	2018-01-02 18:46:41 +01:00
Michael Teeuw	20823bfc87	Add missing package-lock.json. v2.2.2	2018-01-02 18:41:33 +01:00
Connor Christie	be3d703692	Fix linter errors	2018-01-01 10:55:39 -06:00
Connor Christie	e2df5739f0	Update module docs	2018-01-01 10:40:52 -06:00
Connor Christie	7bb11d6436	Add documentation regarding updates	2018-01-01 10:38:00 -06:00
Connor Christie	80b84212cc	Add notification for module dom creation with async support	2018-01-01 10:23:15 -06:00
Connor Christie	4a1bee769b	Add true module dom creation events	2018-01-01 09:42:34 -06:00
Michael Teeuw	de99a7aeaf	Merge 2.2.1 changes.	2018-01-01 14:23:38 +01:00
Michael Teeuw	a0a02701b0	Update version number. v2.2.1 V2.2.1	2018-01-01 13:42:39 +01:00
Michael Teeuw	1314ae1555	Add info about v2.2.1	2018-01-01 13:40:39 +01:00
Michael Teeuw	67cf0e745c	Fix linting errors.	2018-01-01 13:39:05 +01:00
Michael Teeuw	538a2acbf5	Fix linting errors.	2018-01-01 13:38:07 +01:00
Michael Teeuw	8d0e453666	Preparation for v2.3.0 release.	2018-01-01 12:59:28 +01:00
Michael Teeuw	ace04f0b30	Merge pull request #1115 from MichMich/develop ... Cleanup. v2.2.0	2018-01-01 12:48:22 +01:00
Michael Teeuw	f8e25d6c4a	Cleanup.	2018-01-01 12:47:54 +01:00
Michael Teeuw	b2bc43da4f	Merge pull request #1113 from MichMich/develop ... Release v2.2.0.	2018-01-01 12:44:24 +01:00
Michael Teeuw	cb12e540d2	Add package lock.	2018-01-01 12:40:37 +01:00
Michael Teeuw	39955af2fa	Upgrade packages.	2018-01-01 12:36:53 +01:00
Michael Teeuw	86e1f0615d	Prepare for release v2.2.0	2018-01-01 12:33:00 +01:00
Michael Teeuw	dc81ab6dee	Merge pull request #1111 from TTigges/weather_decimal_marks ... added option of decimal comma for temp values for default weather modules	2017-12-31 12:25:24 +01:00
Michael Teeuw	f8cf6a65ae	Merge branch 'develop' into weather_decimal_marks	2017-12-31 12:25:06 +01:00
Michael Teeuw	ba909c696d	Merge branch 'develop' into weather_decimal_marks	2017-12-31 12:24:25 +01:00
Torben Tigges	df0515cebf	currentweather, weatherforecast, changed option of decimal comma to any decimal symbol	2017-12-31 01:15:59 +01:00
Torben Tigges	46c0e14d67	currentweather, weatherforecast, added option of decimal comma for temperature values to config	2017-12-30 22:03:26 +01:00
Michael Teeuw	97d7733464	Remove trailing spaces.	2017-12-30 21:46:34 +01:00
Michael Teeuw	afda84ef09	Electron reverted.	2017-12-30 21:39:56 +01:00
Michael Teeuw	61d6e74102	Use an old electron version ... ... Hopefully Electron will be fixed soon.	2017-12-30 21:33:56 +01:00
Michael Teeuw	8d74258ce2	Merge pull request #1102 from EricWarnke/patch-1 ... Spelling/grammar fix	2017-12-13 09:22:38 +01:00
Eric Warnke	5dfba0b834	Spelling/gramar fix	2017-12-12 15:54:33 -07:00
Michael Teeuw	056370ec08	Merge pull request #1092 from sebcaps/develop ... Fix #1091 : handle empty description	2017-11-26 20:54:13 +01:00
unknown	4e2c254558	Fix #1091 : handle empty description	2017-11-26 11:52:01 +01:00
Michael Teeuw	38c2bdb447	Merge pull request #1090 from rejas/patch-1 ... Fix typo	2017-11-26 10:42:20 +01:00
Veeck	0cee4717e2	Fix typo	2017-11-26 10:02:31 +01:00
Michael Teeuw	221b04c466	Merge pull request #1089 from MichMich/patch-1 ... Update CHANGELOG.md	2017-11-25 12:15:54 +01:00
Michael Teeuw	237e9b7191	Merge pull request #1088 from reeno/patch-2 ... fixed width Font Awesome symbols	2017-11-25 12:15:27 +01:00
Michael Teeuw	9457e44a88	Update CHANGELOG.md	2017-11-25 12:14:54 +01:00