3076 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Veeck	06e8308dc2	Replace old js files with modern code	2020-04-20 10:51:27 +02:00
Michael Teeuw	c8a9c9b84e	Merge pull request #1991 from rejas/cleanup_config_check ... Cleanup config check script	2020-04-19 09:10:41 +02:00
Veeck	e85b49c573	Update changelog	2020-04-19 08:22:48 +02:00
Veeck	c7c6dc4e67	Move config check into js folder, cleanup var usage	2020-04-19 07:55:56 +02:00
Michael Teeuw	172d668416	Merge pull request #1963 from AndreKoepke/feature/client_https ... add https support for clientonly-mode	2020-04-15 09:57:53 +02:00
AndreKoepke	b651dc845b	no single quotes	2020-04-14 14:10:29 +02:00
Michael Teeuw	c755f44153	Merge pull request #1981 from rejas/remove_grunt ... Remove grunt, use non-grunt linters instead	2020-04-10 21:55:41 +02:00
rejas	ed28ce1874	Update changelog and lock	2020-04-10 16:12:51 +02:00
rejas	194af0e985	Run linter and npm audit	2020-04-10 15:09:08 +02:00
rejas	ab3015df6b	Remove rest of grunt calls	2020-04-10 14:43:58 +02:00
rejas	f36df159e0	Replace grunt-jsonlint with jsonlint	2020-04-10 12:24:08 +02:00
rejas	61462cf57e	Replace grunt-eslint with eslint	2020-04-10 07:48:28 +02:00
rejas	427d186c86	Replace grunt-markdownlint with markdownlint-cli	2020-04-10 07:48:28 +02:00
rejas	84e9c47a67	Replace grunt-stylelint with stylelint	2020-04-10 07:48:28 +02:00
rejas	18989d593a	Replace grunt-yamllint with yaml-lint	2020-04-10 07:48:28 +02:00
Michael Teeuw	fc624359c5	Merge pull request #1980 from khassel/socketclient_fix ... socketclient.js: add backward compatibility for old module code	2020-04-09 13:50:38 +02:00
Karsten Hassel	1914573634	fixed again ...	2020-04-07 20:26:09 +02:00
Karsten Hassel	1fd36458a6	update CHANGELOG.md	2020-04-07 19:42:16 +02:00
Karsten Hassel	37ee0e568f	socketclient.js: add backward compatibility for old module code	2020-04-07 19:35:21 +02:00
Michael Teeuw	3f8363a5b2	Merge pull request #1976 from Legion2/develop ... Added basename config	2020-04-06 21:55:10 +02:00
Leon Kiefer	e6c0011789	renamed basename to basePath	2020-04-06 21:29:55 +02:00
Leon Kiefer	eb37a495a2	changed headings in Changelog	2020-04-05 23:18:00 +02:00
Leon Kiefer	54542f7f07	added basename config ... use basename in socket.io path fix #1973	2020-04-05 23:00:38 +02:00
AndreKoepke	8e38910dd8	Merge branch 'develop' into feature/client_https	2020-04-03 14:22:41 +02:00
Andre	31b3f778fc	no single quotes	2020-04-03 12:37:33 +02:00
Michael Teeuw	ca3275757b	Fix release date.	2020-04-01 15:40:14 +02:00
Michael Teeuw	501a314597	Start of 2.12.0-develop	2020-04-01 12:28:40 +02:00
Michael Teeuw	447c0bffdc	Merge pull request #1968 from MichMich/develop ... Release 2.11.0 v2.11.0	2020-04-01 12:21:33 +02:00
Michael Teeuw	46df59d77a	Prepare release 2.11.0	2020-04-01 11:52:39 +02:00
Michael Teeuw	8c85e240b7	Merge pull request #1967 from MichMich/rejas-date ... Rejas date	2020-04-01 11:15:31 +02:00
Michael Teeuw	2464d01891	Fix date test.	2020-04-01 10:57:50 +02:00
Michael Teeuw	66642a19c5	Merge branch 'date' of https://github.com/rejas/MagicMirror into rejas-date	2020-04-01 10:08:33 +02:00
Michael Teeuw	f7f4e92e0a	Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop	2020-04-01 09:58:55 +02:00
Michael Teeuw	2674bf22d8	Let's use sensible defaults. :)	2020-04-01 09:44:22 +02:00
Andre	351e0f3a0b	add https support	2020-03-28 12:37:50 +01:00
rejas	ff7dc95e93	Implement suggestions from Michael	2020-03-28 09:24:30 +01:00
rejas	4e4d3418b3	LInt mockdate helper	2020-03-25 06:53:09 +01:00
rejas	3659b5b5c9	Update mockdate info	2020-03-25 06:40:23 +01:00
rejas	65e1b60fb7	Fix error when no compliments are set	2020-03-25 06:40:23 +01:00
rejas	e2427fe299	Try out a mockdate class	2020-03-25 06:40:23 +01:00
rejas	b08f882324	Add (failing) test for new date field	2020-03-25 06:40:23 +01:00
rejas	2a31ece0c6	Refactor code	2020-03-25 06:40:23 +01:00
rejas	cafa4211a6	Update changelog and add another birtday	2020-03-25 06:40:23 +01:00
rejas	82b50d3059	Add basic compliment on a specific day of the year	2020-03-25 06:39:24 +01:00
Michael Teeuw	39cb582e07	Merge pull request #1960 from effelle/develop ... Update pt-br.json	2020-03-24 21:16:41 +01:00
Michael Teeuw	fe6645a420	Merge pull request #1955 from rejas/jshint ... Remove jshint dependency	2020-03-24 21:16:12 +01:00
Michael Teeuw	a49816f4eb	Merge pull request #1948 from rejas/lint ... Run linter tests on travis (was: Run linter before commit)	2020-03-24 21:15:41 +01:00
Michael Teeuw	7ac97f854c	Merge pull request #1937 from Legion2/develop ... use relative path for socket.io	2020-03-24 21:13:36 +01:00
Federico Leoni	8f203852ca	Update CHANGELOG.md	2020-03-24 10:06:12 -03:00
Federico Leoni	c342f7bce6	Update pt-br.json	2020-03-23 14:55:36 -03:00