4549 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Karsten Hassel	7fa54642e1	Merge branch 'develop' into weather-test-absolute ... # Conflicts: # CHANGELOG.md	2022-01-07 21:52:37 +01:00
Michael Teeuw	0e6d40f96c	Merge pull request #2764 from oraclesean/patch-1	2022-01-07 21:44:46 +01:00
Karsten Hassel	cd1fe4e182	weather test for new absolute property	2022-01-07 21:38:56 +01:00
CFenner	c56b601ab8	adjust test case	2022-01-06 21:49:21 +01:00
Christopher Fenner	e78fa11fd4	Update CHANGELOG.md	2022-01-06 21:40:19 +01:00
Christopher Fenner	1619dd29e9	Apply suggestions from code review	2022-01-06 21:28:25 +01:00
CFenner	793f3dd75c	Merge remote-tracking branch 'upstream/develop' into patch-1	2022-01-06 21:24:24 +01:00
Christopher Fenner	ce05f8e958	use solid type for font awesome icons	2022-01-05 13:28:07 +01:00
Christopher Fenner	c8c4585946	use solid type for font awesome icons	2022-01-05 13:27:20 +01:00
Christopher Fenner	990d1adfb2	use solid type for font awesome icons	2022-01-05 13:26:50 +01:00
Christopher Fenner	404343de1d	use solid type for font awesome icons	2022-01-05 13:19:55 +01:00
Christopher Fenner	24bfaaca7e	use solid type for font awesome icons	2022-01-05 13:18:08 +01:00
Christopher Fenner	060ca43fc8	use solid type for font awesome icons ... related to #2768	2022-01-05 13:13:40 +01:00
Fredrik Oterholt	b87e802c8d	Broken link for contribution guidelines ... Replace with correct URL for the contribution guidelines	2022-01-04 09:18:29 +01:00
Sean Scott	0f596d5620	Update weather.js ... Set absoluteDates default to false	2022-01-02 14:45:24 -07:00
Sean Scott	3ebdb67bc0	Update CHANGELOG.md ... Update CHANCEGLOG	2022-01-02 11:44:01 -07:00
Sean Scott	a5668ef729	Update forecast.njk ... Add an absolute date option to the weather module's forecast.	2022-01-02 11:35:29 -07:00
Michael Teeuw	24fccf6c44	Merge pull request #2762 from MichMich/prepare-2.19.0-develop ... Prepare v2.19.0-develop.	2022-01-01 19:47:26 +01:00
Michael Teeuw	e12692252e	Prepare v2.19.0-develop.	2022-01-01 19:37:55 +01:00
Michael Teeuw	a6cbc9f0ef	Merge pull request #2761 from MichMich/develop ... release v2.18.0 v2.18.0	2022-01-01 19:31:41 +01:00
Michael Teeuw	be073daaf2	Merge pull request #2760 from MichMich/prepare-release-2.18.0 ... Prepare-release-2.18.0	2022-01-01 19:24:05 +01:00
Michael Teeuw	4c919a7489	Prepare 2.18.0.	2022-01-01 19:17:35 +01:00
Michael Teeuw	7a7ed48063	Merge pull request #2754 from kolbyjack/broadcast-custom-symbols	2021-12-29 09:14:00 +01:00
Michael Teeuw	01010fe795	Merge pull request #2753 from khassel/calendar-test	2021-12-29 09:13:11 +01:00
Karsten Hassel	32382dc461	Merge branch 'develop' into calendar-test	2021-12-28 13:45:58 +01:00
Jon Kolb	bf83341fb9	Merge branch 'develop' into broadcast-custom-symbols	2021-12-28 07:33:22 -05:00
Michael Teeuw	c4d2a7b409	Merge pull request #2751 from KristjanESPERANTO/patch-1 ... Add End-to-End Testing + Format	2021-12-28 13:23:54 +01:00
Michael Teeuw	4ad832dcdd	Merge pull request #2755 from sdetweil/newcal	2021-12-27 17:59:50 +01:00
sam detweiler	b35d25eda4	Merge branch 'develop' into newcal	2021-12-27 08:29:09 -06:00
Michael Teeuw	da51a5512f	Merge pull request #2756 from sdetweil/fixhttps	2021-12-27 10:19:34 +01:00
Sam Detweiler	710d51bf32	Merge branch 'fixhttps' of https://github.com/sdetweil/MagicMirror into fixhttps	2021-12-26 17:54:32 +01:00
Sam Detweiler	446bb229bc	fix changelog	2021-12-26 17:53:28 +01:00
sam detweiler	c605023bad	Merge branch 'develop' into fixhttps	2021-12-26 10:46:12 -06:00
Sam Detweiler	28d866c001	enable useHTTP for full electron version	2021-12-26 17:43:27 +01:00
Sam Detweiler	95b587381b	add changelog entry	2021-12-26 16:43:14 +01:00
Sam Detweiler	fc14431147	fix date correction comparison for fulldate, just less than, not less or equal	2021-12-26 16:40:17 +01:00
Karsten Hassel	5d8f2f5da1	iterate over timezones	2021-12-26 16:27:40 +01:00
Jon Kolb	cf428dc1f7	Add CHANGELOG entry	2021-12-26 09:44:04 -05:00
Jon Kolb	c579989ded	Perform customEvent symbols replacement in symbolsForEvent	2021-12-26 09:25:28 -05:00
Karsten Hassel	a954a62762	added test for calendar recurring event with checks the correct date displayed (related to #2752)	2021-12-26 14:30:38 +01:00
Kristjan Esperanto	855860c00c	Update CONTRIBUTING.md	2021-12-26 06:54:46 +01:00
Kristjan Esperanto	58c48b1b21	End-to-End Testing + Format	2021-12-25 21:58:30 +01:00
Michael Teeuw	512c392386	Merge pull request #2748 from sdetweil/calfix	2021-12-24 18:00:06 +01:00
Sam Detweiler	c5ed70dbfc	past prettier	2021-12-25 02:26:11 +11:00
Sam Detweiler	f75ca0c399	after prettier	2021-12-25 02:22:42 +11:00
sam detweiler	75c2977daf	Merge branch 'develop' into calfix	2021-12-24 09:17:25 -06:00
Sam Detweiler	b3ef4b40c5	fix calendar across timezone, showEnd/FullDay	2021-12-25 02:10:48 +11:00
Michael Teeuw	bd5664cf8e	Merge pull request #2746 from khassel/node-version-update	2021-12-23 18:56:50 +01:00
Karsten Hassel	272219eb61	Merge branch 'develop' into node-version-update	2021-12-23 18:48:40 +01:00
Michael Teeuw	acbcb47739	Merge pull request #2739 from rico24/develop ... Added missing translations (NL)	2021-12-23 10:27:53 +01:00