4473 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
eouia	d8940a9cea	Merge branch 'ko' of https://github.com/MMRIZE/MagicMirror into ko	2021-10-06 15:42:13 +02:00
eouia	96611333bf	fix translations.js	2021-10-06 15:42:01 +02:00
Michael Teeuw	5074123f57	Merge pull request #2679 from fewieden/clean-up-updatenotifications-and-nunjuck-templating ... Clean up updatenotifications and nunjuck templating	2021-10-06 15:24:02 +02:00
Michael Teeuw	5bfbd3eaa0	Merge branch 'develop' into clean-up-updatenotifications-and-nunjuck-templating	2021-10-06 15:21:54 +02:00
Michael Teeuw	7fdeed14f5	Merge pull request #2680 from rejas/issue_2678	2021-10-05 10:31:18 +02:00
veeck	04a9ca92b5	Update dependencies	2021-10-05 10:24:42 +02:00
Michael Teeuw	016a1e9adb	Merge pull request #2683 from khassel/calendar-test	2021-10-05 08:30:23 +02:00
Karsten Hassel	1d12e57606	move calendar tests from category electron to e2e	2021-10-04 23:04:28 +02:00
Seongnoh Sean Yi	cb753f5371	Merge branch 'develop' into ko	2021-10-04 11:16:33 +02:00
eouia	7a9f9b2705	edit CHANGELOG	2021-10-04 11:15:06 +02:00
eouia	6d4b4dd9fc	fix language Code kr->ko and add missed translation	2021-10-04 11:05:33 +02:00
rejas	3d9c92fb63	Update CHANGELOG	2021-10-02 23:05:10 +02:00
rejas	d4168f6b5d	Use feels_like data from openweathermap instead of calculating it	2021-10-02 22:15:21 +02:00
Felix Wiedenbach	1751cabb9d	remove obsolete snapshot	2021-10-02 14:56:13 +02:00
Felix Wiedenbach	b0e3b6414a	bump ecmascript to 2018 for eslint	2021-10-02 14:42:49 +02:00
Felix Wiedenbach	51967ed9f5	shorthand function	2021-10-02 14:18:58 +02:00
Felix Wiedenbach	fc06f13c30	Merge branch 'develop' into clean-up-updatenotifications-and-nunjuck-templating ... # Conflicts: # CHANGELOG.md	2021-10-02 14:15:54 +02:00
Felix Wiedenbach	b094707324	remove mocking from implementation and use jest to mock git cli instead	2021-10-02 14:08:16 +02:00
Michael Teeuw	e4a0a517d5	Merge 2.17.1	2021-10-01 18:58:26 +02:00
Michael Teeuw	222a5f3779	Merge pull request #2674 from rejas/issue_2671_master ... Update electron to fix certificate errors v2.17.1	2021-10-01 18:48:07 +02:00
veeck	72f7106086	Update version	2021-10-01 18:31:29 +02:00
veeck	33387b60cc	Update CHANGELOG	2021-10-01 18:30:06 +02:00
veeck	83cc18f648	Update electron to fix certificate errors	2021-10-01 18:27:29 +02:00
Michael Teeuw	1735ca57d5	Fix Formatting	2021-10-01 16:03:29 +02:00
Michael Teeuw	a49459b253	Prepare 2.18.0 Dev Branch	2021-10-01 15:25:54 +02:00
Michael Teeuw	5a4fbbf48a	Merge pull request #2672 from MichMich/develop ... Release 2.17.0 v2.17.0	2021-10-01 15:17:49 +02:00
Michael Teeuw	f7465679c0	Prepare 2.17.0 Release	2021-10-01 15:06:26 +02:00
Michael Teeuw	2a5299ebcb	Merge pull request #2670 from khassel/new-e2e	2021-10-01 14:41:44 +02:00
Karsten Hassel	b3bddb2c99	fix without_modules.js	2021-09-29 22:01:35 +02:00
Karsten Hassel	997aec8cc2	remove default values from test configs	2021-09-29 21:12:03 +02:00
Karsten Hassel	c67320f185	fix logger.js	2021-09-28 22:08:21 +02:00
Karsten Hassel	8224a6ac35	add custom.css before testing	2021-09-28 21:38:30 +02:00
Karsten Hassel	abcee8aa56	fix global-setup.js	2021-09-28 21:23:59 +02:00
Karsten Hassel	23c6b44921	Merge branch 'develop' into new-e2e ... # Conflicts: # CHANGELOG.md	2021-09-28 21:12:04 +02:00
Karsten Hassel	1034171e91	add CHANGELOG	2021-09-28 21:10:24 +02:00
Michael Teeuw	bf49f79e6e	Merge pull request #2669 from rejas/cleanup	2021-09-28 13:34:08 +02:00
veeck	f7f24dbdfe	Update CHANGELOGE	2021-09-28 12:15:07 +02:00
veeck	31ec848aec	Update dependencies	2021-09-28 12:14:58 +02:00
veeck	9eb08420b6	Add proper names to github action steps	2021-09-28 12:14:39 +02:00
veeck	eb6d8d4f83	Remove unused file	2021-09-28 12:14:16 +02:00
Michael Teeuw	e10f620cf9	Merge pull request #2664 from khassel/test-setup	2021-09-28 11:51:19 +02:00
Karsten Hassel	f750436b64	update module clock_es	2021-09-26 22:09:41 +02:00
Karsten Hassel	a4a8504558	update module clock	2021-09-26 22:02:29 +02:00
Karsten Hassel	385e5aabaa	prettier	2021-09-26 00:29:03 +02:00
Karsten Hassel	d831315e20	update module newsfeed	2021-09-26 00:18:22 +02:00
Karsten Hassel	e0906f3462	update module helloworld	2021-09-25 23:52:38 +02:00
Karsten Hassel	6595b6a44f	refactor global-setup.js	2021-09-25 23:45:34 +02:00
Karsten Hassel	0183d7a080	update modules alert and compliments	2021-09-25 23:37:37 +02:00
Karsten Hassel	89e803ee42	update without_modules.js and env_spec.js	2021-09-25 22:12:53 +02:00
Karsten Hassel	c0ce52abe3	change getDocument, delay needed, now 2 tests moved	2021-09-25 00:01:41 +02:00