3059 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
Michael Teeuw	fe1c5df9d5	Merge pull request #1958 from bugsounet/master ... issue #1956	2020-03-19 19:17:03 +01:00
bugsounet	8aa7a55559	issue #1956	2020-03-19 19:03:25 +01:00
rejas	e9461586cb	Update changelog	2020-03-15 21:25:11 +01:00
rejas	a91f2de26a	Remove jshint dependency, use eslint for config verification	2020-03-15 20:38:52 +01:00
rejas	5a4ae99283	Add no-multi-spaces rule to eslint and run it	2020-03-15 15:49:34 +01:00
rejas	437d030502	Remove some dead files, fix stylelint error	2020-03-11 12:44:44 +01:00
rejas	f3d45eff69	Fix js error but add a stylelint error	2020-03-11 11:43:45 +01:00
rejas	f22e39e22b	Add switch to auto fix eslint and stylelint issues	2020-03-11 11:29:59 +01:00
rejas	7470a3b813	Dont fix eslint errors automatically	2020-03-11 10:48:43 +01:00
rejas	0b2e836e3d	Commit a faulty js to see if travis complains	2020-03-11 09:01:21 +01:00
rejas	c3d57eef4f	Remove husky again, move lint as test to travis	2020-03-11 08:52:25 +01:00
rejas	ca2571b438	Update changelog	2020-03-08 16:31:34 +01:00
rejas	6c926b8876	Add husky for pre-commit hook	2020-03-08 16:25:26 +01:00
rejas	5517a913d4	Run linter manually	2020-03-08 16:20:54 +01:00
Michael Teeuw	ef7720ff06	Merge pull request #1939 from dtreskunov/dtreskunov/fix-moon-illumination-percent-calc ... fix floating point bug in moon illumination calc	2020-02-27 16:35:38 +01:00
Michael Teeuw	daa13b4b30	Merge pull request #1941 from bibaldo/bibaldo-currentweather ... Add new default config to 'current weather' module	2020-02-27 16:34:26 +01:00
Michael Teeuw	9d4e237c09	Merge pull request #1938 from tosbaha/develop ... Turkish translation update	2020-02-27 16:32:40 +01:00