kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 04:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Michael Teeuw 2017-05-18 12:33:34 +02:00 committed by GitHub
commit a4c441a1b7
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add test of match current week number on clock module with showWeek configuration. - Add test of match current week number on clock module with showWeek configuration.
- Add test default modules present modules/default/defaultmodules.js. - Add test default modules present modules/default/defaultmodules.js.
- Add unit test calendar_modules function capFirst. - Add unit test calendar_modules function capFirst.
- Add test for check if exists the directories present in defaults modules.
- Add support for showing wind direction as an arrow instead of abbreviation in currentWeather module. - Add support for showing wind direction as an arrow instead of abbreviation in currentWeather module.
- Add support for writing translation fucntions to support flexible word order - Add support for writing translation fucntions to support flexible word order
- Add test for check if exits the directories present in defaults modules. - Add test for check if exits the directories present in defaults modules.

3
installers/raspberry.sh
View File

@ -150,8 +150,7 @@ fi
# Use pm2 control like a service MagicMirror # Use pm2 control like a service MagicMirror
read -p "Do you want use pm2 for auto starting of your MagicMirror (y/n)?" choice read -p "Do you want use pm2 for auto starting of your MagicMirror (y/n)?" choice
if [[ $choice =~ ^[Yy]$ ]] if [[ $choice =~ ^[Yy]$ ]]; then
then
sudo npm install -g pm2 sudo npm install -g pm2
sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi" sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi"
pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json

1
js/socketclient.js
View File

@ -22,7 +22,6 @@ var MMSocket = function(moduleName) {
// register catch all. // register catch all.
self.socket.on("*", function(notification, payload) { self.socket.on("*", function(notification, payload) {
if (notification !== "*") { if (notification !== "*") {
//console.log('Received notification: ' + notification +', payload: ' + payload);
notificationCallback(notification, payload); notificationCallback(notification, payload);
} }
}); });