kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into newscripts

Browse Source
This commit is contained in:
sam detweiler 2019-12-09 09:40:06 -06:00 committed by GitHub
commit 4338f11eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 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
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";

1
package.json
View File

@ -61,7 +61,6 @@
"dependencies": { "dependencies": {
"colors": "^1.1.2", "colors": "^1.1.2",
"console-stamp": "^0.2.9", "console-stamp": "^0.2.9",
"electron": "^3.0.13",
"express": "^4.16.2", "express": "^4.16.2",
"express-ipfilter": "^1.0.1", "express-ipfilter": "^1.0.1",
"feedme": "latest", "feedme": "latest",

4
run-start.sh
View File

@ -15,12 +15,14 @@ serveronly=$(grep -v '^\s//' config/config.js | grep -i serveronly: | awk '{pri
serveronly=${serveronly:-false} serveronly=${serveronly:-false}
# check for xwindows running # check for xwindows running
xorg=$(pgrep Xorg) xorg=$(pgrep Xorg)
#check for macOS
mac=$(uname)
# #
# if the user requested serveronly OR # if the user requested serveronly OR
# electron support for armv6l has been dropped OR # electron support for armv6l has been dropped OR
# system is in text mode # system is in text mode
# #
if [ "$serveronly." != "false." -o "$arch" == "armv6l" -o "$xorg." == "." ]; then if [ "$serveronly." != "false." -o "$arch" == "armv6l" ] || [ "$xorg." == "." -a $mac != 'Darwin' ]; then
# if user explicitly configured to run server only (no ui local) # if user explicitly configured to run server only (no ui local)
# OR there is no xwindows running, so no support for browser graphics # OR there is no xwindows running, so no support for browser graphics

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"