kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-03 22:36:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into patch-2

Browse Source
This commit is contained in:
Krouty 2021-02-21 11:48:47 +01:00 committed by GitHub
commit 9094240024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -19,6 +19,7 @@ _This release is scheduled to be released on 2021-04-01._
- Portuguese translations for "MODULE_CONFIG_CHANGED" and PRECIP. - Portuguese translations for "MODULE_CONFIG_CHANGED" and PRECIP.
- Respect parameter ColoredSymbolOnly also for custom events - Respect parameter ColoredSymbolOnly also for custom events
- Added a new parameter to hide time portion on relative times - Added a new parameter to hide time portion on relative times
- Added locale to sample config file
- Added support for self-signed certificates for the default calendar module (#466) - Added support for self-signed certificates for the default calendar module (#466)
### Updated ### Updated

1
config/config.js.sample
View File

@ -28,6 +28,7 @@ var config = {
httpsCertificate: "", // HTTPS Certificate path, only require when useHttps is true httpsCertificate: "", // HTTPS Certificate path, only require when useHttps is true
language: "en", language: "en",
locale: "en-US",
logLevel: ["INFO", "LOG", "WARN", "ERROR"], // Add "DEBUG" for even more logging logLevel: ["INFO", "LOG", "WARN", "ERROR"], // Add "DEBUG" for even more logging
timeFormat: 24, timeFormat: 24,
units: "metric", units: "metric",