kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity
3,614 Commits 3 Branches 49 Tags
Commit Graph

3614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
veeck
ced0398e49 Update markdowns 2021-01-05 09:53:47 +01:00
Michael Teeuw
d4b57924a7
Merge pull request #2404 from rejas/issue_2402 
Update default log levels
 2021-01-04 13:52:37 +01:00
veeck
d2def2bea3 Update CHANGELOG 2021-01-04 10:03:35 +01:00
veeck
e65bb84f9f Add default values for log levels 2021-01-04 10:01:56 +01:00
Michael Teeuw
69b0aa6118 Prepare v2.15.0-develop 2021-01-01 19:27:07 +01:00
Michael Teeuw
0f1457b5d7 Prepare release 2.14.0 - Fix Version 2021-01-01 19:08:19 +01:00
Michael Teeuw
090873d4c2 Prepare release 2.14.0 2021-01-01 19:07:14 +01:00
Michael Teeuw
da00c168ae
Merge pull request #2398 from fewieden/patch-2 
Highlight required version mismatch
 2021-01-01 15:59:45 +01:00
fewieden
8286d5a06e
Highlight required version mismatch 2021-01-01 14:44:39 +01:00
fewieden
dc5fb978a7
Update CHANGELOG.md 2021-01-01 14:43:16 +01:00
Michael Teeuw
a4ab0cbe09
Merge pull request #2397 from ashishtank/develop 
Added support for variables in nunjucks templates for translate filter
 2020-12-31 19:57:03 +01:00
Ashish Tank
4a341b381e Added support for variables in nunjucks templates for translate filter 2020-12-31 18:58:21 +01:00
ashishtank
3fa98bc1aa
Merge pull request #8 from MichMich/develop 
Develop
 2020-12-31 18:51:38 +01:00
Michael Teeuw
87e2e87ce6
Merge pull request #2395 from ashishtank/develop 
Added support for optional DEGREE position in "FEELS" label
 2020-12-31 16:44:25 +01:00
Michael Teeuw
c25b6dc16c
Merge pull request #2392 from sdetweil/fix-update 
Fix simple-git version for unhandle promise rejection
 2020-12-31 16:43:26 +01:00
sam detweiler
6a786aa090
Merge branch 'develop' into fix-update 2020-12-31 09:35:29 -06:00
Michael Teeuw
a97d87bce8
Merge pull request #2387 from bugsounet/patch-1 
No Text Select for Touch Screen use
 2020-12-31 16:29:14 +01:00
Ashish Tank
fba91329f1 Added support optional support for DEGREE position in FEELS translation 2020-12-31 16:28:00 +01:00
Michael Teeuw
353cc3b00f
Merge pull request #2393 from MikeBishop/translator_falsy_vars 
Permit substituting a falsy value in translator variables
 2020-12-31 16:27:43 +01:00
ashishtank
057ef63586
Merge pull request #7 from MichMich/develop 
Develop
 2020-12-31 16:15:26 +01:00
Mike Bishop
c9fb38981e CHANGELOG 2020-12-31 10:11:43 -05:00
Mike Bishop
9ea7de8b44 Permit substituting a falsy value in translator variables 2020-12-31 10:10:01 -05:00
Sam Detweiler
020c8ccd2a fix update notification 2383 2020-12-31 09:08:23 -06:00
Sam Detweiler
4d09abe725 fix node-ical version 0.12.7 for bad rrule throw 2020-12-31 07:40:40 -06:00
Sam Detweiler
5079e30caf Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop 2020-12-31 07:36:37 -06:00
Bugsounet - Cédric
3e5c1a278b
Update CHANGELOG.md 2020-12-30 11:38:28 +01:00
Bugsounet - Cédric
4ded60874f
No Text Select for Touch Screen use 2020-12-30 11:34:09 +01:00
Michael Teeuw
ff1a843de6
Merge pull request #2386 from khassel/fix_modules_array 
removes undefined objects from modules array, see issue #2382
 2020-12-29 23:01:25 +01:00
Karsten Hassel
e6cefcf948 Merge branch 'develop' into fix_modules_array 
# Conflicts:
#	CHANGELOG.md
 2020-12-29 22:24:19 +01:00
Michael Teeuw
a857412f13
Merge pull request #2385 from rejas/missing_function_call 
Add missing function call in module.js
 2020-12-29 22:15:55 +01:00
Karsten Hassel
e507f95b2a added suggestion from @rejas 2020-12-29 21:45:35 +01:00
Karsten Hassel
61cf92c67a removes undefined objects from modules array, see issue #2382 2020-12-29 21:14:42 +01:00
rejas
7a4eddc592 Adjust some log levels 2020-12-29 18:50:27 +01:00
rejas
3fcbf15915 Update CHANGELOG 2020-12-29 18:50:10 +01:00
rejas
efafb1c28a Cleanup jsdoc 2020-12-29 18:48:45 +01:00
rejas
67bedf8648 Add missing function () 2020-12-29 18:38:38 +01:00
Michael Teeuw
c1d35b0f91
Merge pull request #2384 from rejas/log_level_sample 
Update config sample
 2020-12-29 16:23:39 +01:00
Michael Teeuw
d3a715bd6b
Merge pull request #2381 from sdetweil/node-ical-again 
change node-ical version again
 2020-12-29 16:22:52 +01:00
Michael Teeuw
28b52cd24f
Merge pull request #2379 from sdetweil/fix-package 
Fix package.json electron dependency
 2020-12-29 16:22:33 +01:00
Michael Teeuw
46e77f805c
Merge pull request #2377 from buxxi/gitignore-merge 
Merging config/.gitignore with .gitignore
 2020-12-29 16:21:47 +01:00
buxxi
dd23db0ad8 Running prettier for CHANGELOG 2020-12-29 12:43:40 +01:00
rejas
30cf7f8afe Update CHANGELOG 2020-12-29 10:23:57 +01:00
rejas
7802e0bb88 Set locationID everywhere on config sample 2020-12-29 10:23:12 +01:00
rejas
07e75b8550 Adjust log level in sample 2020-12-29 10:21:50 +01:00
Sam Detweiler
1e9fad8278 Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop 2020-12-28 12:21:48 -06:00
Sam Detweiler
0975826457 update node-ical version 2020-12-28 08:24:19 -06:00
Sam Detweiler
e5ff320591 fix package.json for optional dependency 2020-12-28 08:15:40 -06:00
Sam Detweiler
02c1e47749 Merge branch 'develop' of https://github.com/MichMich/MagicMirror into fix-package 2020-12-28 08:13:50 -06:00
buxxi
a50824eeee Merging config/.gitignore with .gitignore 2020-12-28 11:50:01 +01:00
Michael Teeuw
0c3f9f4ed9
Merge pull request #2372 from sdetweil/update_node-ical 
update node-ical to 0.12.4
 2020-12-23 17:51:42 +01:00