Commit Graph

372 Commits

Author SHA1 Message Date
Michael Teeuw fd49be1d9b Remove unreachable code. 2020-06-14 14:14:30 +02:00
Michael Teeuw c40a5648dd Merge branch 'develop' into config_logger 2020-06-14 14:02:48 +02:00
rejas c7a88e2f12 Throw error when check_config fails 2020-06-14 11:04:11 +02:00
rejas 963b1aa6b1 Final cleanups I think 2020-06-02 15:05:31 +02:00
rejas 008ac2876b More console -> Logger conversions 2020-06-02 15:05:31 +02:00
Veeck 13073bc98d Lint stuff 2020-06-02 15:03:59 +02:00
Veeck 2334cbd78a User logger in checkconfig script 2020-06-02 15:03:59 +02:00
rejas 0cae954f80 Use Log in loader too 2020-06-02 15:03:59 +02:00
rejas c60446a015 Fix tests 2020-06-02 15:03:59 +02:00
Veeck d0c6a4ee6d Make logger configurable 2020-06-02 15:03:59 +02:00
rejas f2d03a511e User logger in node files 2020-06-02 15:03:59 +02:00
rejas 367233c318 Add console-stamp to node-logger 2020-06-02 15:03:59 +02:00
rejas 9461c1692a Add node/browser wrapper around logger 2020-06-02 15:03:59 +02:00
Veeck abb5dc5739 Run prettier over ALL files once
No other changes done in this commit
2020-05-11 22:22:32 +02:00
Veeck 18820c383d Use correct object in browser context 2020-05-06 22:19:07 +02:00
Veeck 7fc7d626bc Add Module to globals, cleanup comments 2020-05-05 14:55:15 +02:00
Veeck 5386ca1592 Merge branch 'develop' into no_undef 2020-05-05 14:20:24 +02:00
Michael Teeuw 08ed019426 Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop 2020-05-05 14:18:14 +02:00
Michael Teeuw 55c6a5aa27 remove unused file 2020-05-05 14:17:46 +02:00
rejas c04fa496bf Second round of undef fixes 2020-05-03 18:59:26 +02:00
rejas b9d19cfcb4 First round of undef fixes 2020-05-03 12:40:48 +02:00
rejas d8f093b226 Cleanup some globals 2020-05-02 10:33:24 +02:00
rejas e7fc4ef1e7 Replace unsecure links with https ones 2020-04-28 23:05:28 +02:00
rejas 14aa4036e0 Some spelling and doc fixes 2020-04-22 22:09:31 +02:00
rejas b1fb177e4b Undo "fix" in main.js that broke the tests 2020-04-21 12:38:29 +02:00
Veeck ec187fe109 Update changelog and commen tags 2020-04-21 12:23:50 +02:00
Veeck 9ec329b7ae Final fixes for eslint:recommended 2020-04-21 12:23:50 +02:00
rejas d08bd4e866 Fix lots of warnings 2020-04-21 12:23:50 +02:00
rejas 941d5d7cd9 Fix mixed tabs and whitespace errors 2020-04-21 12:23:50 +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
Karsten Hassel 1914573634 fixed again ... 2020-04-07 20:26:09 +02:00
Karsten Hassel 37ee0e568f socketclient.js: add backward compatibility for old module code 2020-04-07 19:35:21 +02:00
Leon Kiefer e6c0011789 renamed basename to basePath 2020-04-06 21:29:55 +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 f7f4e92e0a Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop 2020-04-01 09:58:55 +02:00
Andre 351e0f3a0b add https support 2020-03-28 12:37:50 +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
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 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 5517a913d4 Run linter manually 2020-03-08 16:20:54 +01:00
Leon Kiefer 6aeec81072 removed additional slash from the socket.io path 2020-02-19 20:58:58 +01:00
Leon Kiefer 7b56817ae6 use relative path for socket.io fix #1934 2020-02-18 17:09:25 +01:00
Michael Teeuw 30e93a9372 Merge pull request #1915 from normankong/develop
Support HTTPS Magicmirror (resubmit)
2020-02-06 10:10:06 +01:00