kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-30 13:09:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into newElectron

Browse Source
This commit is contained in:
sam detweiler 2019-12-10 08:31:50 -06:00 committed by GitHub
commit 6b6ee934a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -25,7 +25,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Updated ### Updated
### Fixed ### Fixed
- Fixed issue in weatherforecast module where predicted amount of rain was not using the decimal symbol specified in config.js.
## [2.9.0] - 2019-10-01 ## [2.9.0] - 2019-10-01
ℹ️ **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). ℹ️ **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).

4
README.md
View File

@ -178,13 +178,13 @@ For more available modules, check out out the wiki page [MagicMirror² 3rd Party
If you want to update your MagicMirror² to the latest version, use your terminal to go to your Magic Mirror folder and type the following command: If you want to update your MagicMirror² to the latest version, use your terminal to go to your Magic Mirror folder and type the following command:
``` ```
installers/upgrade-script.sh bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/upgrade-script.sh)"
``` ```
This will do a test run This will do a test run
If the test update looks good then run this command If the test update looks good then run this command
``` ```
installers/upgrade-script.sh apply bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/upgrade-script.sh)" apply
``` ```
If there are changes you have made, they will be listed, and u will have the opportunity to save your work If there are changes you have made, they will be listed, and u will have the opportunity to save your work

8
config/config.js.sample
View File

@ -25,10 +25,10 @@ var config = {
timeFormat: 24, timeFormat: 24,
units: "metric", units: "metric",
// serverOnly: true/false/"local" , // serverOnly: true/false/"local" ,
// local for armv6l processors, default // local for armv6l processors, default
// starts serveronly and then starts chrome browser // starts serveronly and then starts chrome browser
// false, default for all NON-armv6l devices // false, default for all NON-armv6l devices
// true, force serveronly mode, because you want to.. no UI on this device // true, force serveronly mode, because you want to.. no UI on this device
modules: [ modules: [
{ {

14
css/custom.css
View File

@ -1,14 +0,0 @@
/*****************************************************
* Magic Mirror *
* Custom CSS *
* *
* By Michael Teeuw http://michaelteeuw.nl *
* MIT Licensed. *
* *
* Add any custom CSS below. *
* Changes to this files will be ignored by GIT. *
*****************************************************/
body {
}

12
installers/upgrade-script.sh
View File

@ -78,12 +78,12 @@ if [ -d ~/MagicMirror ]; then
fi fi
# if we want just the modules listed in config.js now # if we want just the modules listed in config.js now
#if [ $justActive == $true ]; then if [ $justActive == $true ]; then
# if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then
# echo downloading dumpactivemodules script >> $logfile echo downloading dumpactivemodules script >> $logfile
# curl -sL https://www.dropbox.com/s/wwe6bfg2lcjmj43/dumpactivemodules.js?dl=0 > ~/MagicMirror/installers/dumpactivemodules.js curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/develop/installers/dumpactivemodules.js > ~/MagicMirror/installers/dumpactivemodules.js
# fi fi
#fi fi
echo update log will be in $logfile echo update log will be in $logfile
# used for parsing the array of module names # used for parsing the array of module names
SAVEIFS=$IFS # Save current IFS SAVEIFS=$IFS # Save current IFS

4
modules/default/weatherforecast/weatherforecast.js
View File

@ -180,9 +180,9 @@ Module.register("weatherforecast",{
rainCell.innerHTML = ""; rainCell.innerHTML = "";
} else { } else {
if(config.units !== "imperial") { if(config.units !== "imperial") {
rainCell.innerHTML = parseFloat(forecast.rain).toFixed(1) + " mm"; rainCell.innerHTML = parseFloat(forecast.rain).toFixed(1).replace(".", this.config.decimalSymbol) + " mm";
} else { } else {
rainCell.innerHTML = (parseFloat(forecast.rain) / 25.4).toFixed(2) + " in"; rainCell.innerHTML = (parseFloat(forecast.rain) / 25.4).toFixed(2).replace(".", this.config.decimalSymbol) + " in";
} }
} }
rainCell.className = "align-right bright rain"; rainCell.className = "align-right bright rain";

2
untrack-css.sh
View File

@ -1,6 +1,6 @@
# Long history here # Long history here
# https://github.com/MichMich/MagicMirror/pull/1540 # https://github.com/MichMich/MagicMirror/pull/1540
STATUS_CUSTOM_CSS=$(git ls-files -v css/custom.css|cut -f 1 --delimiter=" ") STATUS_CUSTOM_CSS=$(git ls-files -v css/custom.css| awk '{print $1}')
if [ "$STATUS_CUSTOM_CSS" = "H" ]; then if [ "$STATUS_CUSTOM_CSS" = "H" ]; then
echo "We'll remove from the repository the css/custom.css" echo "We'll remove from the repository the css/custom.css"