Merge remote-tracking branch 'roramirez_github/develop' into check-wrong-configuration

This commit is contained in:
Rodrigo Ramírez Norambuena
2017-04-06 21:29:20 -03:00
110 changed files with 1792 additions and 26916 deletions

View File

@@ -1,10 +1,11 @@
{
"name": "magicmirror",
"version": "2.1.1",
"description": "A modular interface for smart mirrors.",
"version": "2.1.2-dev",
"description": "The open source modular smart mirror platform.",
"main": "js/electron.js",
"scripts": {
"start": "sh run-start.sh",
"install": "cd vendor && npm install",
"postinstall": "sh installers/postinstall/postinstall.sh",
"test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive",
"test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
@@ -29,7 +30,7 @@
"bugs": {
"url": "https://github.com/MichMich/MagicMirror/issues"
},
"homepage": "https://github.com/MichMich/MagicMirror#readme",
"homepage": "https://magicmirror.builders",
"devDependencies": {
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
@@ -40,6 +41,7 @@
"grunt-stylelint": "latest",
"grunt-yamllint": "latest",
"jshint": "^2.9.4",
"http-auth": "^3.1.3",
"mocha": "^3.2.0",
"spectron": "^3.4.1",
"stylelint-config-standard": "latest",