Skip to content

Commit e6fb18d

Browse files
authored
Merge pull request #1627 from MichMich/develop
Release 2.7.0
2 parents de57daa + 43ba13f commit e6fb18d

Some content is hidden

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

46 files changed

+1307
-599
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- "7"
3+
- "8"
44
before_script:
55
- yarn danger ci
66
- npm install grunt-cli -g

CHANGELOG.md

Lines changed: 84 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,80 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
---
77

8+
❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² core.
9+
10+
## [2.8.0] - Unreleased
11+
12+
*This release is scheduled to be released on 2019-04-01.*
13+
14+
### Added
15+
16+
### Updated
17+
18+
### Fixed
19+
20+
## [2.7.0] - 2019-04-01
21+
22+
ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`. If you are having issues running Electron, make sure your [Raspbian is up to date](https://www.raspberrypi.org/documentation/raspbian/updating.md).
23+
24+
### Added
25+
- Italian translation for "Feels"
26+
- Basic Klingon (tlhIngan Hol) translations
27+
- Disabled the screensaver on raspbian with installation script
28+
- Added option to truncate the number of vertical lines a calendar item can span if `wrapEvents` is enabled.
29+
- Danish translation for "Feels" and "Weeks"
30+
- Added option to split multiple day events in calendar to separate numbered events
31+
- Slovakian translation
32+
- Alerts now can contain Font Awesome icons
33+
- Notifications display time can be set in request
34+
- Newsfeed: added support for `ARTICLE_INFO_REQUEST` notification
35+
- Add `name` config option for calendars to be sent along with event broadcasts
36+
37+
### Updated
38+
- Bumped the Electron dependency to v3.0.13 to support the most recent Raspbian. [#1500](https://github.com/MichMich/MagicMirror/issues/1500)
39+
- Updated modernizr code in alert module, fixed a small typo there too
40+
- More verbose error message on console if the config is malformed
41+
- Updated installer script to install Node.js version 10.x
42+
43+
### Fixed
44+
- Fixed temperature displays in currentweather and weatherforecast modules [#1503](https://github.com/MichMich/MagicMirror/issues/1503), [#1511](https://github.com/MichMich/MagicMirror/issues/1511).
45+
- Fixed unhandled error on bad git data in updatenotification module [#1285](https://github.com/MichMich/MagicMirror/issues/1285).
46+
- Weather forecast now works with openweathermap in new weather module. Daily data are displayed, see issue [#1504](https://github.com/MichMich/MagicMirror/issues/1504).
47+
- Fixed analogue clock border display issue where non-black backgrounds used (previous fix for issue 611)
48+
- 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).
49+
- Installation script problems with raspbian
50+
- Calendar: only show repeating count if the event is actually repeating [#1534](https://github.com/MichMich/MagicMirror/pull/1534)
51+
- Calendar: Fix exdate handling when multiple values are specified (comma separated)
52+
- Calendar: Fix relative date handling for fulldate events, calculate difference always from start of day [#1572](https://github.com/MichMich/MagicMirror/issues/1572)
53+
- Fix null dereference in moduleNeedsUpdate when the module isn't visible
54+
- Calendar: Fixed event end times by setting default calendarEndTime to "LT" (Local time format). [#1479]
55+
- Calendar: Fixed missing calendar fetchers after server process restarts [#1589](https://github.com/MichMich/MagicMirror/issues/1589)
56+
- Notification: fixed background color (was white text on white background)
57+
- Use getHeader instead of data.header when creating the DOM so overwriting the function also propagates into it
58+
- Fix documentation of `useKMPHwind` option in currentweather
59+
60+
### New weather module
61+
- Fixed weather forecast table display [#1499](https://github.com/MichMich/MagicMirror/issues/1499).
62+
- Dimmed loading indicator for weather forecast.
63+
- Implemented config option `decimalSymbol` [#1499](https://github.com/MichMich/MagicMirror/issues/1499).
64+
- Aligned indoor values in current weather vertical [#1499](https://github.com/MichMich/MagicMirror/issues/1499).
65+
- Added humidity support to nunjuck unit filter.
66+
- Do not display degree symbol for temperature in Kelvin [#1503](https://github.com/MichMich/MagicMirror/issues/1503).
67+
- Weather forecast now works with openweathermap for both, `/forecast` and `/forecast/daily`, in new weather module. If you use the `/forecast`-weatherEndpoint, the hourly data are converted to daily data, see issues [#1504](https://github.com/MichMich/MagicMirror/issues/1504), [#1513](https://github.com/MichMich/MagicMirror/issues/1513).
68+
- Added fade, fadePoint and maxNumberOfDays properties to the forecast mode [#1516](https://github.com/MichMich/MagicMirror/issues/1516)
69+
- Fixed Loading string and decimalSymbol string replace [#1538](https://github.com/MichMich/MagicMirror/issues/1538)
70+
- Show Snow amounts in new weather module [#1545](https://github.com/MichMich/MagicMirror/issues/1545)
71+
- Added weather.gov as a new weather provider for US locations
72+
873
## [2.6.0] - 2019-01-01
974

1075
ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`. If you are having issues updating, make sure you are running the latest version of Node.
1176

1277
### ✨ Experimental ✨
1378
- New default [module weather](modules/default/weather). This module will eventually replace the current `currentweather` and `weatherforecast` modules. The new module is still pretty experimental, but it's included so you can give it a try and help us improve this module. Please give us you feedback using [this forum post](https://forum.magicmirror.builders/topic/9335/default-weather-module-refactoring).
1479

80+
A huge, huge, huge thanks to user @fewieden for all his hard work on the new `weather` module!
81+
1582
### Added
1683
- Possibility to add classes to the cell of symbol, title and time of the events of calendar.
1784
- Font-awesome 5, still has 4 for backwards compatibility.
@@ -60,7 +127,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
60127
- Fixed gzip encoded calendar loading issue #1400.
61128
- Mixup between german and spanish translation for newsfeed.
62129
- Fixed close dates to be absolute, if no configured in the config.js - module Calendar
63-
- Fixed the UpdateNotification module message about new commits in the repository, so they can be correctly localized in singular and plural form.
130+
- Fixed the updatenotification module message about new commits in the repository, so they can be correctly localized in singular and plural form.
64131
- Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374)
65132
- Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694.
66133
- Fix weather city ID link in sample config
@@ -210,7 +277,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
210277
- Add `clientonly` script to start only the electron client for a remote server.
211278
- Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `default/calendar` module.
212279
- Add `.vscode/` folder to `.gitignore` to keep custom Visual Studio Code config out of git.
213-
- Add unit test the capitalizeFirstLetter function of newfeed module.
280+
- Add unit test the capitalizeFirstLetter function of newsfeed module.
214281
- Add new unit tests for function `shorten` in calendar module.
215282
- Add new unit tests for function `getLocaleSpecification` in calendar module.
216283
- Add unit test for js/class.js.
@@ -231,7 +298,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
231298
- Set version of the `express-ipfilter` on 0.3.1.
232299

233300
### Fixed
234-
- Fixed issue with incorrect allignment of analog clock when displayed in the center column of the MM.
301+
- Fixed issue with incorrect alignment of analog clock when displayed in the center column of the MM.
235302
- Fixed ipWhitelist behaviour to make empty whitelist ([]) allow any and all hosts access to the MM.
236303
- Fixed issue with calendar module where 'excludedEvents' count towards 'maximumEntries'.
237304
- Fixed issue with calendar module where global configuration of maximumEntries was not overridden by calendar specific config (see module doc).
@@ -255,7 +322,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
255322
- Add unit test calendar_modules function capFirst.
256323
- Add test for check if exists the directories present in defaults modules.
257324
- Add support for showing wind direction as an arrow instead of abbreviation in currentWeather module.
258-
- Add support for writing translation fucntions to support flexible word order
325+
- Add support for writing translation functions to support flexible word order
259326
- Add test for check if exits the directories present in defaults modules.
260327
- Add calendar option to set a separate date format for full day events.
261328
- Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification
@@ -274,7 +341,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
274341
- Fix double message about port when server is starting
275342
- Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW.
276343
- Removed unused import from js/electron.js
277-
- Made calendar.js respect config.timeFormat irrespecive of locale setting.
344+
- Made calendar.js respect config.timeFormat irrespective of locale setting.
278345
- Fixed alignment of analog clock when a large calendar is displayed in the same side bar.
279346

280347
## [2.1.1] - 2017-04-01
@@ -292,7 +359,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
292359
- Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION` and `UPDATE_NOTIFICATION_MODULE` to Finnish translations.
293360
- Run `npm test` on Travis automatically.
294361
- Show the splash screen image even when is reboot or halted.
295-
- Added some missing translaton strings in the sv.json file.
362+
- Added some missing translation strings in the sv.json file.
296363
- Run task jsonlint to check translation files.
297364
- Restructured Test Suite.
298365

@@ -309,12 +376,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
309376
- Option to use RegExp in Calendar's titleReplace.
310377
- Hungarian Translation.
311378
- Icelandic Translation.
312-
- Add use a script to prevent when is run by SSH session set DISPLAY enviroment.
313-
- Enable ability to set configuration file by the enviroment variable called MM_CONFIG_FILE.
379+
- Add use a script to prevent when is run by SSH session set DISPLAY environment.
380+
- Enable ability to set configuration file by the environment variable called MM_CONFIG_FILE.
314381
- Option to give each calendar a different color.
315382
- Option for colored min-temp and max-temp.
316383
- Add test e2e helloworld.
317-
- Add test e2e enviroment.
384+
- Add test e2e environment.
318385
- Add `chai-as-promised` npm module to devDependencies.
319386
- Basic set of tests for clock module.
320387
- Run e2e test in Travis.
@@ -332,10 +399,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
332399
- Added tests for Translations, dev argument, version, dev console.
333400
- Added test anytime feature compliments module.
334401
- Added test ipwhitelist configuration directive.
335-
- Added test for calendar module: default, basic-auth, backward compability, fail-basic-auth.
402+
- Added test for calendar module: default, basic-auth, backward compatibility, fail-basic-auth.
336403
- Added meta tags to support fullscreen mode on iOS (for server mode)
337404
- Added `ignoreOldItems` and `ignoreOlderThan` options to the News Feed module
338-
- Added test for MM_PORT enviroment variable.
405+
- Added test for MM_PORT environment variable.
339406
- Added a configurable Week section to the clock module.
340407

341408
### Fixed
@@ -347,7 +414,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
347414
- Module currentWeather: check if temperature received from api is defined.
348415
- Fix an issue with module hidden status changing to `true` although lock string prevented showing it.
349416
- Fix newsfeed module bug (removeStartTags)
350-
- Fix when is set MM_PORT enviroment variable.
417+
- Fix when is set MM_PORT environment variable.
351418
- Fixed missing animation on `this.show(speed)` when module is alone in a region.
352419

353420
## [2.1.0] - 2016-12-31
@@ -369,8 +436,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
369436
- 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.
370437
- Possibility to use the 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.
371438
- Added option to show rain amount in the weatherforecast default module
372-
- Add module `updatenotification` to get an update whenever a new version is availabe. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/updatenotification) for more information.
373-
- Add the abilty to set timezone on the date display in the Clock Module
439+
- Add module `updatenotification` to get an update whenever a new version is available. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/updatenotification) for more information.
440+
- Add the ability to set timezone on the date display in the Clock Module
374441
- Ability to set date format in calendar module
375442
- Possibility to use currentweather for the compliments
376443
- Added option `disabled` for modules.
@@ -409,7 +476,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
409476
- Added ability to define "the day after tomorrow" for calendar events (Definition for German and Dutch already included).
410477
- Added CII Badge (we are compliant with the CII Best Practices)
411478
- Add support for doing http basic auth when loading calendars
412-
- Add the abilty to turn off and on the date display in the Clock Module
479+
- Add the ability to turn off and on the date display in the Clock Module
413480

414481
### Fixed
415482
- Fix typo in installer.
@@ -432,8 +499,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
432499

433500
### Fixed
434501
- Prevent `getModules()` selectors from returning duplicate entries.
435-
- Append endpoints of weather modules with `/` to retreive the correct data. (Issue [#337](https://github.com/MichMich/MagicMirror/issues/337))
436-
- Corrected grammer in `module.js` from 'suspend' to 'suspended'.
502+
- Append endpoints of weather modules with `/` to retrieve the correct data. (Issue [#337](https://github.com/MichMich/MagicMirror/issues/337))
503+
- Corrected grammar in `module.js` from 'suspend' to 'suspended'.
437504
- Fixed openweathermap.org URL in config sample.
438505
- Prevent currentweather module from crashing when received data object is incorrect.
439506
- Fix issue where translation loading prevented the UI start-up when the language was set to 'en'. (Issue [#388](https://github.com/MichMich/MagicMirror/issues/388))

README.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<a href="http://choosealicense.com/licenses/mit"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License"></a>
88
<a href="https://travis-ci.org/MichMich/MagicMirror"><img src="https://travis-ci.org/MichMich/MagicMirror.svg" alt="Travis"></a>
99
<a href="https://snyk.io/test/github/MichMich/MagicMirror"><img src="https://snyk.io/test/github/MichMich/MagicMirror/badge.svg" alt="Known Vulnerabilities" data-canonical-src="https://snyk.io/test/github/MichMich/MagicMirror" style="max-width:100%;"></a>
10-
<a href="http://slack.magicmirror.builders"><img src="http://slack.magicmirror.builders:3000/badge.svg" alt="Slack Status"></a>
1110
</p>
1211

1312
**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](http://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors).
@@ -16,18 +15,22 @@ MagicMirror² focuses on a modular plugin system and uses [Electron](http://elec
1615

1716
## Table Of Contents
1817

18+
- [Table Of Contents](#table-of-contents)
1919
- [Installation](#installation)
2020
- [Raspberry Pi](#raspberry-pi)
21-
- [General](#general)
21+
- [Automatic Installation (Raspberry Pi only!)](#automatic-installation-raspberry-pi-only)
22+
- [Manual Installation](#manual-installation)
2223
- [Server Only](#server-only)
2324
- [Client Only](#client-only)
2425
- [Docker](#docker)
2526
- [Configuration](#configuration)
27+
- [Raspberry Specific](#raspberry-specific)
28+
- [General](#general)
2629
- [Modules](#modules)
2730
- [Updating](#updating)
28-
- [Known Issues](#known-issues)
2931
- [Community](#community)
3032
- [Contributing Guidelines](#contributing-guidelines)
33+
- [Enjoying MagicMirror? Consider a donation!](#enjoying-magicmirror-consider-a-donation)
3134
- [Manifesto](#manifesto)
3235

3336
## Installation
@@ -125,7 +128,7 @@ The following wiki links are helpful for the initial configuration of your Magic
125128
**Note:** If you used the installer script. This step is already done for you.
126129

127130
2. Modify your required settings. \
128-
Note: You'll can check your configuration running `npm run config:check` in `/home/pi/MagicMirror`.
131+
Note: You can check your configuration running `npm run config:check` in `/home/pi/MagicMirror`.
129132

130133

131134
The following properties can be configured:
@@ -199,6 +202,16 @@ Please keep the following in mind:
199202

200203
Thanks for your help in making MagicMirror² better!
201204

205+
206+
## Enjoying MagicMirror? Consider a donation!
207+
208+
MagicMirror² is opensource and free. That doesn't mean we don't need any money.
209+
210+
Please consider a donation to help us cover the ongoing costs like webservers and email services.
211+
If we recieve enough donations we might even be able to free up some working hours and spend some extra time improving the MagicMirror² core.
212+
213+
To donate, please follow [this](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G5D8E9MR5DTD2&source=url) link.
214+
202215
## Manifesto
203216

204217
A real Manifesto is still to be written. Till then, Michael's response on [one of the repository issues](https://github.com/MichMich/MagicMirror/issues/1174) gives a great summary:

installers/raspberry.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ sudo apt-get --assume-yes install curl wget git build-essential unzip || exit
4747
# Check if we need to install or upgrade Node.js.
4848
echo -e "\e[96mCheck current Node installation ...\e[0m"
4949
NODE_INSTALL=false
50-
if command_exists node; then
50+
if command_exists node && command_exists npm; then
5151
echo -e "\e[0mNode currently installed. Checking version number.";
5252
NODE_CURRENT=$(node -v)
5353
echo -e "\e[0mMinimum Node version: \e[1m$NODE_TESTED\e[0m"
@@ -82,7 +82,7 @@ if $NODE_INSTALL; then
8282
# The NODE_STABLE_BRANCH variable will need to be manually adjusted when a new branch is released. (e.g. 7.x)
8383
# Only tested (stable) versions are recommended as newer versions could break MagicMirror.
8484

85-
NODE_STABLE_BRANCH="9.x"
85+
NODE_STABLE_BRANCH="10.x"
8686
curl -sL https://deb.nodesource.com/setup_$NODE_STABLE_BRANCH | sudo -E bash -
8787
sudo apt-get install -y nodejs
8888
echo -e "\e[92mNode.js installation Done!\e[0m"
@@ -152,9 +152,19 @@ fi
152152
read -p "Do you want use pm2 for auto starting of your MagicMirror (y/N)?" choice
153153
if [[ $choice =~ ^[Yy]$ ]]; then
154154
sudo npm install -g pm2
155-
sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi"
156-
pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json
157-
pm2 save
155+
if [[ "$(ps --no-headers -o comm 1)" =~ systemd ]]; then #Checking for systemd
156+
sudo pm2 startup systemd -u pi --hp /home/pi
157+
else
158+
sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi"
159+
fi
160+
pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json
161+
pm2 save
162+
fi
163+
# Disable Screensaver
164+
read -p "Do you want to disable the screen saver? (y/N)?" choice
165+
if [[ $choice =~ ^[Yy]$ ]]; then
166+
sudo su -c "echo -e '@xset s noblank\n@xset s off\n@xset -dpms' >> /etc/xdg/lxsession/LXDE-pi/autostart"
167+
export DISPLAY=:0; xset s noblank;xset s off;xset -dpms
158168
fi
159169

160170
echo " "

0 commit comments

Comments
 (0)