mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-29 12:39:45 +00:00
Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop
This commit is contained in:
commit
ec57a240d5
@ -5,3 +5,6 @@ node_js:
|
|||||||
before_script:
|
before_script:
|
||||||
- npm install grunt-cli -g
|
- npm install grunt-cli -g
|
||||||
script: grunt
|
script: grunt
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- node_modules
|
||||||
|
@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|||||||
- Add use pm2 for manager process into Installer RaspberryPi script
|
- Add use pm2 for manager process into Installer RaspberryPi script
|
||||||
- Russian Translation
|
- Russian Translation
|
||||||
- Afrikaans Translation
|
- Afrikaans Translation
|
||||||
|
- Add postinstall script to notify user that MagicMirror installed successfully despite warnings from NPM.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- Update .gitignore to not ignore default modules folder.
|
- Update .gitignore to not ignore default modules folder.
|
||||||
@ -139,7 +140,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- Added reference to Italian Translation.
|
- Added reference to Italian Translation.
|
||||||
- Added the missing NE translation to all languages. [#565](https://github.com/MichMich/MagicMirror/issues/344)
|
- Added the missing NE translation to all languages. [#344](https://github.com/MichMich/MagicMirror/issues/344)
|
||||||
- Added proper User-Agent string to calendar call.
|
- Added proper User-Agent string to calendar call.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
2
installers/postinstall/postinstall.sh
Normal file
2
installers/postinstall/postinstall.sh
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
echo "\033[32mMagicMirror installation successful!"
|
||||||
|
exit 0
|
@ -4,7 +4,8 @@
|
|||||||
"description": "A modular interface for smart mirrors.",
|
"description": "A modular interface for smart mirrors.",
|
||||||
"main": "js/electron.js",
|
"main": "js/electron.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "electron js/electron.js"
|
"start": "electron js/electron.js",
|
||||||
|
"postinstall": "sh installers/postinstall/postinstall.sh"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user