kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2026-07-27 23:59:50 -07:00
Code Issues Projects Releases Wiki Activity
4,064 Commits 3 Branches 55 Tags
95d1b8a6d068cd3dcddeccbeff576badfa4c358e
Commit Graph
4064 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gerardo GonzalezandGitHub 12cc670642 Merge branch 'develop' into patch-1 2021-04-10 14:04:53 +01:00
Michael TeeuwandGitHub 13fcb55df6 Merge pull request #2518 from oemel09/hide-newsfeed-description 2021-04-10 14:56:49 +02:00
oemel09 a4dfd15888 Fixes tests for newsfeed description 2021-04-10 09:13:14 +02:00
Gerardo GonzalezandGitHub 7fbd326298 Update CHANGELOG.md 
updating the changelog for the fix Fix wrong treatment of `appendLocationNameToHeader` when using `ukmetofficedatahub`
 2021-04-10 01:30:12 +01:00
Gerardo GonzalezandGitHub 331d147d50 Update ukmetofficedatahub.js 
There is a wrong treatment to appendLocationNameToHeader.
The location should be always returned and leave the weater.js to decide if is included or not in the header.
 2021-04-10 01:20:52 +01:00
oemel09 acdcdc55bc Adjusts parenthesis in template to be consistent 2021-04-09 08:07:37 +02:00
oemel09 fdb0c0acb3 Adds test to check that newsfeed description does not show up 2021-04-09 08:05:19 +02:00
Earl Man 564bf47fb2 update sample css 2021-04-08 14:56:01 -05:00
Earl Man eca35b2371 change --base to --font-size 2021-04-08 14:51:07 -05:00
Earl Man f97d2e2644 revert 'dimming' method 2021-04-08 14:48:23 -05:00
Earl Man fdd6659139 delete useless file 2021-04-08 14:39:21 -05:00
Earl Man 0d698fb659 Merge remote-tracking branch 'upstream/develop' into contribute 2021-04-08 14:35:39 -05:00
Earl Man c68b39dda8 Merge branch 'css-properties' 2021-04-08 14:24:39 -05:00
oemel09 cb67286bc3 Adds test to validate that description is shown 2021-04-08 17:00:15 +02:00
oemel09 a49962b8de Moves validation into template 2021-04-08 17:00:15 +02:00
oemel09 256d5ae14f Rebases onto develop 2021-04-08 16:59:46 +02:00
oemel09 799ee8bcfa Check showDescription setting for newsfeed module 2021-04-08 16:59:03 +02:00
Michael TeeuwandGitHub fe8a317ef9 Merge pull request #2514 from jupadin/log-consistency 
Log consistency
 2021-04-08 11:04:11 +02:00
Michael Teeuw b6d6ee45e0 Fix linter issue. 2021-04-08 10:40:31 +02:00
Michael TeeuwandGitHub 0151466a28 Merge branch 'develop' into log-consistency 2021-04-08 10:37:18 +02:00
earlmanandGitHub 3588875e28 Update .gitignore 2021-04-04 13:52:18 -05:00
earlman e8031aec39 add original main.css bak 2021-04-04 13:34:52 -05:00
earlman 1cabe107e6 run prettier 2021-04-04 13:28:56 -05:00
earlman ba0c59744b update CHANGELOG.md 2021-04-04 13:28:34 -05:00
earlman 50c702c00a adjust new opacities 2021-04-04 13:24:59 -05:00
earlman ff8c2fe227 add custom.css.sample 2021-04-04 13:22:33 -05:00
earlman f9c78a5263 use variables for fonts 2021-04-04 13:18:33 -05:00
earlman d46784a4d5 base font sizes on rem and var(--base) 2021-04-04 13:05:41 -05:00
earlman ff43d082f2 base line-height on scale 2021-04-04 12:53:35 -05:00
earlman 83801736d7 add color variables 2021-04-04 12:38:17 -05:00
earlman e16986cf71 Merge branch 'develop' of https://github.com/MichMich/MagicMirror into contribute 2021-04-04 11:55:03 -05:00
earlman 7ad12d954c add original main.css bak 2021-04-04 11:51:04 -05:00
Julian Dinter fb74fadec2 Run 'npm run lint:prettier'. 2021-04-04 15:37:47 +02:00
Julian Dinter c00bdf910e Clean up code by adding comments. 2021-04-04 15:22:12 +02:00
Julian Dinter 50cc1c56e5 Consistent log text. 2021-04-04 15:17:42 +02:00
Julian Dinter 0006099758 Changed log type of starting function of updatenotification module. 2021-04-04 14:52:24 +02:00
earlman 162dcec331 Merge branch 'master' of https://github.com/foundations-design/WhiteLight into develop 2021-04-03 11:15:33 -05:00
earlman 3e8bd022e2 add custom variables 2021-04-02 11:28:22 -05:00
earlman 01e5936671 install valid-url 2021-04-02 10:11:38 -05:00
Michael TeeuwandGitHub d85e1c70d6 Merge pull request #2512 from jupadin/log-consistency 2021-04-02 12:56:28 +02:00
Julian Dinter f329770194 Added fix in CHANGELOG. 2021-04-02 12:42:31 +02:00
Julian Dinter 08194925cb Changed log type of starting function of calendar module. 2021-04-02 12:26:34 +02:00
earlman 2b7aa3e810 use yarn 2021-04-01 15:59:48 -05:00
earlman 549417f106 yarn 2021-04-01 15:00:12 -05:00
earlman f0f370cc7d add *.env to .gitignore 2021-04-01 15:00:06 -05:00
earlman b842241f8c fix broken start scripts & yarn 2021-04-01 14:08:48 -05:00
earlman 93aa4b7440 update README.md 2021-04-01 14:03:38 -05:00
Michael TeeuwandGitHub 9e2eef7818 Merge pull request #2511 from khassel/update-node-ical 2021-04-01 20:12:12 +02:00
Karsten Hassel b29b65851e Bump node-ical to v0.13.0 (now last runtime dependency using deprecated request package is removed). 2021-04-01 20:02:08 +02:00
Michael Teeuw a6829bff4f Prepare develop: v2.16.0-develop 2021-04-01 14:36:50 +02:00