4624 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Michael Teeuw	672575e427	Merge pull request #2747 from khassel/electron-tests ... fix electron tests	2021-12-23 10:27:42 +01:00
Michael Teeuw	be0b3b1d63	Merge pull request #2745 from KristjanESPERANTO/shebang ... Add missing shebang	2021-12-23 10:27:30 +01:00
Karsten Hassel	c88d25b4ee	update node versions in templates and github workflows	2021-12-22 22:35:55 +01:00
Karsten Hassel	9b83862a96	fixed electron tests with retry, update dependencies	2021-12-22 22:31:39 +01:00
Kristjan SCHMIDT	21c7f0da6e	Added missing shebang	2021-12-22 21:00:13 +01:00
Michael Teeuw	dca5759569	Merge pull request #2744 from MichMich/patch-use-https-for-shields ... Use https for shield links.	2021-12-22 09:13:27 +01:00
Michael Teeuw	0abf87bfa2	Use https for links and images.	2021-12-22 09:08:43 +01:00
rico24	6b8b37843b	Added missing translations	2021-12-21 20:50:11 +01:00
Michael Teeuw	fa0b83f056	Merge pull request #2738 from MichMich/patch-replace-broken-shields ... Replace broken shields.	2021-12-21 20:36:21 +01:00
Michael Teeuw	a706fa3590	Add changelog.	2021-12-21 20:31:13 +01:00
Michael Teeuw	852aa3d260	Remove flacky badge.	2021-12-21 20:30:09 +01:00
Michael Teeuw	c4edcaad87	Replace broken shields.	2021-12-21 20:12:05 +01:00
Michael Teeuw	9d0cab01d5	Merge pull request #2736 from rejas/issue_2712 ... Allow dangerouslyDisablingAutoEscaping in newsfeed items	2021-12-21 19:44:03 +01:00
Michael Teeuw	c3e507234d	Merge pull request #2737 from rejas/RelativeFullDayEvents ... Resubmit of "Relative full day events"	2021-12-21 19:42:47 +01:00
rejas	405ec82dd0	Run prettier	2021-12-21 15:22:52 +01:00
rejas	9c4c77fe84	Merge branch 'develop' into RelativeFullDayEvents	2021-12-21 15:19:36 +01:00
rejas	831afdf9e7	Update CHANGELOG	2021-12-21 13:35:38 +01:00
rejas	1996efb183	Add new variable dangerouslyDisableAutoEscaping	2021-12-21 13:31:39 +01:00
rejas	19bb2a0238	Add safe option to newsfeed templates	2021-12-21 08:13:00 +01:00
Michael Teeuw	af6cf70558	Merge pull request #2734 from rejas/issue_2731	2021-12-20 19:41:31 +01:00
rejas	9b57e6049e	Update CHANGELOG	2021-12-20 13:37:07 +01:00
rejas	f54c06fb94	Add test for old items	2021-12-20 13:35:50 +01:00
rejas	2107e7c427	Show empty message when no newsfeed items are available	2021-12-20 13:29:56 +01:00
Michael Teeuw	eae277f165	Merge pull request #2730 from khassel/newsfeed-user-agent	2021-12-14 05:59:57 +01:00
Karsten Hassel	a9c4ad2895	update User-Agent-Header in calendarfetcher	2021-12-13 23:00:07 +01:00