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 fixdefmod

Browse Source
This commit is contained in:
Michael Teeuw 2017-01-10 19:52:20 +01:00 committed by GitHub
commit f31049cf69
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -4,11 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [2.1.1] - Unreleased ## [2.1.1] - Unreleased
### Changed
- Installer: Use init config.js from config.js.sample.
### Added ### Added
- Add loaded function to modules, providing an async callback. - Add loaded function to modules, providing an async callback.
### Fixed ### Fixed
- Update .gitignore to not ignore default modules folder - Update .gitignore to not ignore default modules folder.
- Remove white flash on boot up.
## [2.1.0] - 2016-12-31 ## [2.1.0] - 2016-12-31

2
LICENSE.md
View File

@ -1,7 +1,7 @@
The MIT License (MIT) The MIT License (MIT)
===================== =====================
Copyright © 2016 Michael Teeuw Copyright © 2016-2017 Michael Teeuw
Permission is hereby granted, free of charge, to any person Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation obtaining a copy of this software and associated documentation

3
installers/raspberry.sh
View File

@ -113,6 +113,9 @@ else
exit; exit;
fi fi
# Use sample config for start MagicMirror
cp config/config.js.sample config/config.js
# Check if plymouth is installed (default with PIXEL desktop environment), then install custom splashscreen. # Check if plymouth is installed (default with PIXEL desktop environment), then install custom splashscreen.
echo -e "\e[96mCheck plymouth installation ...\e[0m" echo -e "\e[96mCheck plymouth installation ...\e[0m"
if command_exists plymouth; then if command_exists plymouth; then

3
js/electron.js
View File

@ -28,7 +28,8 @@ function createWindow() {
webPreferences: { webPreferences: {
nodeIntegration: false, nodeIntegration: false,
zoomFactor: config.zoom zoomFactor: config.zoom
} },
backgroundColor: "#000000"
} }
// DEPRECATED: "kioskmode" backwards compatibility, to be removed // DEPRECATED: "kioskmode" backwards compatibility, to be removed