Skip to content

Commit a2d7cdc

Browse files
authored
Merge pull request #2834 from MichMich/develop
Release v2.19.0
2 parents a6cbc9f + d995ce3 commit a2d7cdc

File tree

158 files changed

+3002
-5696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+3002
-5696
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ When submitting a new issue, please supply the following information:
4444

4545
**Node Version**: Make sure it's version 14 or later (recommended is 16).
4646

47-
**MagicMirror Version**: Please let us know which version of MagicMirror you are running. It can be found in the `package.json` file.
47+
**MagicMirror² Version**: Please let us know which version of MagicMirror² you are running. It can be found in the `package.json` file.
4848

4949
**Description**: Provide a detailed description about the issue and include specific details to help us understand the problem. Adding screenshots will help describing the problem.
5050

.github/ISSUE_TEMPLATE.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ If you're not sure if it's a real bug or if it's just you, please open a topic o
1010

1111
Problems installing or configuring your MagicMirror? Check out: [https://forum.magicmirror.builders/category/10/troubleshooting](https://forum.magicmirror.builders/category/10/troubleshooting)
1212

13-
A common problem is that your config file could be invalid. Please run in your MagicMirror directory: `npm run config:check` and see if it reports an error.
13+
A common problem is that your config file could be invalid. Please run in your MagicMirror² directory: `npm run config:check` and see if it reports an error.
1414

15-
## I found a bug in the MagicMirror installer
15+
## I found a bug in the MagicMirror² installer
1616

17-
If you are facing an issue or found a bug while trying to install MagicMirror via the installer please report it in the respective GitHub repository:
17+
If you are facing an issue or found a bug while trying to install MagicMirror² via the installer please report it in the respective GitHub repository:
1818
[https://github.com/sdetweil/MagicMirror_scripts](https://github.com/sdetweil/MagicMirror_scripts)
1919

20-
## I found a bug in the MagicMirror Docker image
20+
## I found a bug in the MagicMirror² Docker image
2121

22-
If you are facing an issue or found a bug while running MagicMirror inside a Docker container please create an issue in the corresponding repository:
22+
If you are facing an issue or found a bug while running MagicMirror² inside a Docker container please create an issue in the corresponding repository:
2323

2424
- karsten13/magicmirror: [https://gitlab.com/khassel/magicmirror](https://gitlab.com/khassel/magicmirror)
2525
- (deprecated) bastilimbach/docker-magicmirror: [https://github.com/bastilimbach/docker-MagicMirror](https://github.com/bastilimbach/docker-MagicMirror)
@@ -35,7 +35,7 @@ When submitting a new issue, please supply the following information:
3535

3636
**Node Version**: Make sure it's version 14 or later (recommended is 16).
3737

38-
**MagicMirror Version**: Please let us know which version of MagicMirror you are running. It can be found in the `package.json` file.
38+
**MagicMirror² Version**: Please let us know which version of MagicMirror² you are running. It can be found in the `package.json` file.
3939

4040
**Description**: Provide a detailed description about the issue and include specific details to help us understand the problem. Adding screenshots will help describing the problem.
4141

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Hello and thank you for wanting to contribute to the MagicMirror project
1+
Hello and thank you for wanting to contribute to the MagicMirror² project
22

33
**Please make sure that you have followed these 4 rules before submitting your Pull Request:**
44

.github/workflows/automated-tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,4 @@ jobs:
3333
npm run test:prettier
3434
npm run test:js
3535
npm run test:css
36-
npm run test:unit
37-
npm run test:e2e
38-
npm run test:electron
36+
npm run test

.husky/pre-commit

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
32

4-
npm run lint:staged
3+
[ -f "$(dirname "$0")/_/husky.sh" ] && . "$(dirname "$0")/_/husky.sh"
4+
5+
if command -v npm &> /dev/null; then
6+
npm run lint:staged
7+
fi

CHANGELOG.md

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,41 @@ This project adheres to [Semantic Versioning](https://semver.org/).
55

66
❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror².
77

8+
## [2.19.0] - 2022-04-01
9+
10+
Special thanks to the following contributors: @10bias, @CFenner, @JHWelch, @k1rd3rf, @khassel, @kolbyjack, @krekos, @KristjanESPERANTO, @Nerfzooka, @oraclesean, @oscarb, @philnagel, @rejas, @sdetweil, @shin10, @SiderealArt and @Tom-Hirschberger.
11+
12+
### Added
13+
14+
- Added a config option under the weather module, `absoluteDates`, providing an option to format weather forecast date output with either absolute or relative dates.
15+
- Added test for new weather forecast `absoluteDates` porperty.
16+
- The modules get a class hidden added/removed if they get hidden/shown which will also toggle pointer-events.
17+
- Added new config option `showTitleAsUrl` to newsfeed module. If set, the diplayed title is a link to the article which is useful when running in a browser and you want to read this article.
18+
- Added internal cors proxy to get weather providers working without public proxies (fixes #2714). The new url `http(s)://address:port/cors?url=https://whatever-to-proxy` can be used in other modules too.
19+
- Added a WeatherProvider for Weatherflow.
20+
- Added new env var `ELECTRON_DISABLE_GPU` which disable gpu under electron if set (fixes #2831).
21+
- Added missing Czech translations.
22+
23+
### Updated
24+
25+
- Deprecated roboto fonts package `roboto-fontface-bower` replaced with `fontsource`.
26+
- Update `electron` to v17, `helmet` to v5 (use defaults of v4) and other dependencies
27+
- Updates Font Awesome css class to new default style (fixes #2768)
28+
- Replaced deprecated modules `currentweather` and `weatherforecast` with dummy modules only displaying that they have to be replaced.
29+
- Include all calendar events from the configured date range when broadcasting.
30+
- Update Danish and German translation.
31+
- Update `node-ical` to v0.15 and added `luxon` as dependency for not breaking the "no-optional" install (see #2718 and #2824).
32+
33+
### Fixed
34+
35+
- Improved and speedup e2e tests, artificial wait after mm start removed.
36+
- Improved husky setup not blocking `git commit` if `husky` or `npm` is not installed.
37+
- Using a consistent spelling of MagicMirror².
38+
- Fix minor console output issue for loading translations (#2814).
39+
- Don't adjust startDate for full day events if endDate is in the past.
40+
- Fix windspeed conversion error in openweathermap provider. (#2812)
41+
- Fix conflicting parms turning off showEnd for full day events. (#2629)
42+
843
## [2.18.0] - 2022-01-01
944

1045
Special thanks to the following contributors: @AmpioRosso, @eouia, @fewieden, @jupadin, @khassel, @kolbyjack, @KristjanESPERANTO, @MariusVaice, @rejas, @rico24 and @sdetweil.
@@ -29,6 +64,7 @@ Special thanks to the following contributors: @AmpioRosso, @eouia, @fewieden, @j
2964
- Added dangerouslyDisableAutoEscaping config option for newsfeed templates (fixes #2712).
3065
- Added missing shebang to `installers/mm.sh`.
3166
- Node versions in templates and github workflows.
67+
- Updated translations for Traditional Chinese (Taiwan) (zh-tw.json).
3268

3369
### Fixed
3470

@@ -252,7 +288,7 @@ Special thanks to the following contributors: @Alvinger, @AndyPoms, @ashishtank,
252288
- Rename Greek translation to correct ISO 639-1 alpha-2 code (gr > el). (#2155)
253289
- Add a space after icons of sunrise and sunset. (#2169)
254290
- Fix calendar when no DTEND record found in event, startDate overlay when endDate set. (#2177)
255-
- Fix windspeed convertion error in ukmetoffice weather provider. (#2189)
291+
- Fix windspeed conversion error in ukmetoffice weather provider. (#2189)
256292
- Fix console.debug not having timestamps. (#2199)
257293
- Fix calendar full day event east of UTC start time. (#2200)
258294
- Fix non-fullday recurring rule processing. (#2216)
@@ -275,8 +311,8 @@ Special thanks to the following contributors: @bryanzzhu, @bugsounet, @chamakura
275311
### Added
276312

277313
- `--dry-run` Added option in fetch call within updatenotification node_helper. This is to prevent
278-
MagicMirror from consuming any fetch result. Causes conflict with MMPM when attempting to check
279-
for updates to MagicMirror and/or MagicMirror modules.
314+
MagicMirror² from consuming any fetch result. Causes conflict with MMPM when attempting to check
315+
for updates to MagicMirror² and/or MagicMirror² modules.
280316
- Test coverage with Istanbul, run it with `npm run test:coverage`.
281317
- Added lithuanian language.
282318
- Added support in weatherforecast for OpenWeather onecall API.
@@ -349,7 +385,7 @@ Special thanks to the following contributors: @AndreKoepke, @andrezibaia, @bryan
349385

350386
🚨 READ THIS BEFORE UPDATING 🚨
351387

352-
In the past years the project has grown a lot. This came with a huge downside: poor maintainability. If I let the project continue the way it was, it would eventually crash and burn. More important: I would completely lose the drive and interest to continue the project. Because of this the decision was made to simplify the core by removing all side features like automatic installers and support for exotic platforms. This release (2.11.0) is the first real release that will reflect (parts) of these changes. As a result of this, some things might break. So before you continue make sure to backup your installation. Your config, your modules or better yet: your full MagicMirror folder. In other words: update at your own risk.
388+
In the past years the project has grown a lot. This came with a huge downside: poor maintainability. If I let the project continue the way it was, it would eventually crash and burn. More important: I would completely lose the drive and interest to continue the project. Because of this the decision was made to simplify the core by removing all side features like automatic installers and support for exotic platforms. This release (2.11.0) is the first real release that will reflect (parts) of these changes. As a result of this, some things might break. So before you continue make sure to backup your installation. Your config, your modules or better yet: your full MagicMirror² folder. In other words: update at your own risk.
353389

354390
For more information regarding this major change, please check issue [#1860](https://github.com/MichMich/MagicMirror/issues/1860).
355391

@@ -550,7 +586,7 @@ Fixed `package.json` version number.
550586
- Fixed unhandled error on bad git data in updatenotification module [#1285](https://github.com/MichMich/MagicMirror/issues/1285).
551587
- Weather forecast now works with openweathermap in new weather module. Daily data are displayed, see issue [#1504](https://github.com/MichMich/MagicMirror/issues/1504).
552588
- Fixed analogue clock border display issue where non-black backgrounds used (previous fix for issue 611)
553-
- Fixed compatibility issues caused when modules request different versions of Font Awesome, see issue [#1522](https://github.com/MichMich/MagicMirror/issues/1522). MagicMirror now uses [Font Awesome 5 with v4 shims included for backwards compatibility](https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#shims).
589+
- Fixed compatibility issues caused when modules request different versions of Font Awesome, see issue [#1522](https://github.com/MichMich/MagicMirror/issues/1522). MagicMirror² now uses [Font Awesome 5 with v4 shims included for backwards compatibility](https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#shims).
554590
- Installation script problems with raspbian
555591
- Calendar: only show repeating count if the event is actually repeating [#1534](https://github.com/MichMich/MagicMirror/pull/1534)
556592
- Calendar: Fix exdate handling when multiple values are specified (comma separated)
@@ -662,7 +698,7 @@ A huge, huge, huge thanks to user @fewieden for all his hard work on the new `we
662698

663699
## [2.4.0] - 2018-07-01
664700

665-
⚠️ **Warning:** This release includes an updated version of Electron. This requires a Raspberry Pi configuration change to allow the best performance and prevent the CPU from overheating. Please read the information on the [MagicMirror Wiki](https://github.com/michmich/magicmirror/wiki/configuring-the-raspberry-pi#enable-the-open-gl-driver-to-decrease-electrons-cpu-usage).
701+
⚠️ **Warning:** This release includes an updated version of Electron. This requires a Raspberry Pi configuration change to allow the best performance and prevent the CPU from overheating. Please read the information on the [MagicMirror² Wiki](https://github.com/michmich/magicmirror/wiki/configuring-the-raspberry-pi#enable-the-open-gl-driver-to-decrease-electrons-cpu-usage).
666702

667703
ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
668704

@@ -903,7 +939,7 @@ A huge, huge, huge thanks to user @fewieden for all his hard work on the new `we
903939
- Add use pm2 for manager process into Installer RaspberryPi script.
904940
- Russian Translation.
905941
- Afrikaans Translation.
906-
- Add postinstall script to notify user that MagicMirror installed successfully despite warnings from NPM.
942+
- Add postinstall script to notify user that MagicMirror² installed successfully despite warnings from NPM.
907943
- Init tests using mocha.
908944
- Option to use RegExp in Calendar's titleReplace.
909945
- Hungarian Translation.
@@ -966,7 +1002,7 @@ A huge, huge, huge thanks to user @fewieden for all his hard work on the new `we
9661002
- Add VSCode IntelliSense support.
9671003
- Module API: Add Visibility locking to module system. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#visibility-locking) for more information.
9681004
- Module API: Method to overwrite the module's header. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#getheader) for more information.
969-
- Module API: Option to define the minimum MagicMirror version to run a module. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#requiresversion) for more information.
1005+
- Module API: Option to define the minimum MagicMirror² version to run a module. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#requiresversion) for more information.
9701006
- Calendar module now broadcasts the event list to all other modules using the notification system. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/calendar) for more information.
9711007
- Possibility to use the calendar feed as the source for the weather (currentweather & weatherforecast) location data. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/weatherforecast) for more information.
9721008
- Added option to show rain amount in the weatherforecast default module
@@ -1113,6 +1149,6 @@ It includes (but is not limited to) the following features:
11131149

11141150
## [1.0.0] - 2014-02-16
11151151

1116-
### Initial release of MagicMirror.
1152+
### Initial release of MagicMirror
11171153

11181154
This was part of the blogpost: [https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the](https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Contributions of all kinds are welcome, not only in the form of code but also wi
4040
- documentation
4141
- translations
4242

43-
For the full contribution guidelines, check out: [https://docs.magicmirror.builders/getting-started/contributing.html](https://docs.magicmirror.builders/getting-started/contributing.html)
43+
For the full contribution guidelines, check out: [https://docs.magicmirror.builders/about/contributing.html](https://docs.magicmirror.builders/about/contributing.html)
4444

4545
## Enjoying MagicMirror? Consider a donation!
4646

config/config.js.sample

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
/* Magic Mirror Config Sample
1+
/* MagicMirror² Config Sample
22
*
33
* By Michael Teeuw https://michaelteeuw.nl
44
* MIT Licensed.
55
*
66
* For more information on how you can configure this file
7-
* see https://docs.magicmirror.builders/getting-started/configuration.html#general
7+
* see https://docs.magicmirror.builders/configuration/introduction.html
88
* and https://docs.magicmirror.builders/modules/configuration.html
99
*/
1010
let config = {
@@ -14,7 +14,7 @@ let config = {
1414
// - "0.0.0.0", "::" to listen on any interface
1515
// Default, when address config is left out or empty, is "localhost"
1616
port: 8080,
17-
basePath: "/", // The URL path where MagicMirror is hosted. If you are using a Reverse proxy
17+
basePath: "/", // The URL path where MagicMirror² is hosted. If you are using a Reverse proxy
1818
// you must set the sub path here. basePath must end with a /
1919
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
2020
// or add a specific IPv4 of 192.168.1.5 :

css/custom.css.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Magic Mirror Custom CSS Sample
1+
/* MagicMirror² Custom CSS Sample
22
*
33
* Change color and fonts here.
44
*

css/main.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,14 @@ sup {
138138
margin-bottom: var(--gap-modules);
139139
}
140140

141+
.module.hidden {
142+
pointer-events: none;
143+
}
144+
145+
.module:not(.hidden) {
146+
pointer-events: auto;
147+
}
148+
141149
.region.bottom .module {
142150
margin-top: var(--gap-modules);
143151
margin-bottom: 0;
@@ -170,10 +178,6 @@ sup {
170178
pointer-events: none;
171179
}
172180

173-
.region.fullscreen * {
174-
pointer-events: auto;
175-
}
176-
177181
.region.right {
178182
right: 0;
179183
text-align: right;

0 commit comments

Comments
 (0)