From 9e6e34eda06ad42449429bacd3b3bae4b491f580 Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Thu, 7 Apr 2016 21:04:24 -0400 Subject: [PATCH 1/6] Markdown Love: Part I --- README.md | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 44e4a800..37751cc7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # MagicMirror² [![Dependency Status](https://david-dm.org/MichMich/MagicMirror/v2-beta.svg)](https://david-dm.org/MichMich/MagicMirror/v2-beta) - [![devDependency Status](https://david-dm.org/MichMich/MagicMirror/v2-beta/dev-status.svg)](https://david-dm.org/MichMich/MagicMirror/v2-beta#info=devDependencies) This version of the Magic Mirror software focusses on a modular plugin system. Besides that, the Magic Mirror software now also uses [Electron](http://electron.atom.io/), so no more webserver or browser installs necessary. @@ -31,7 +30,7 @@ This version of the Magic Mirror software focusses on a modular plugin system. B 6. Enter the repository: `cd MagicMirror` 7. `npm install && npm start` (You may have to restart your terminal before this works!) -**Important:** `npm start` does **not** work via SSH, use `DISPLAY=:0 nohup npm start &` instead. +**Important:** `npm start` does **not** work via SSH, use `DISPLAY=:0 nohup npm start &` instead. This starts the mirror on the remote display. ## Configuration @@ -62,13 +61,19 @@ The following modules are installed by default. The following modules are created by their respective authors. -- **[MMM-FRITZ-Box-Callmonitor by PaViRo](https://github.com/paviro/MMM-FRITZ-Box-Callmonitor)**
FRITZ!Box Callmonitor (Display an alert when someone is calling ...) +| **Module Name** | **Author** | **Link** | +|------------------------ |------------------------------------------------ |------------------- | +| FRITZ!Box Call Monitor | Paul Vincent-Roll ([paviro](paviro)) | [Click Here](fcm) | +| Facial Recognition | Paul Vincent-Roll ([paviro](paviro)) | [Click Here](fr) | +| Wunderlist | Paul Vincent-Roll ([paviro](paviro)) | [Click Here](wl) | +| WordNik | Sam Vendittelli ([SVendittelli](svendittelli)) | [Click Here](wn) | -- **[MMM-Facial-Recognition by PaViRo](https://github.com/paviro/MMM-Facial-Recognition)**
Facial recognition and module swapping based on the current user ... - -- **[MMM-Wunderlist by PaViRo](https://github.com/paviro/MMM-Wunderlist)**
Displays your Wunderlist todos on your mirror ... - -- **[MMM-wordnik by Vendittelli](https://github.com/SVendittelli/MMM-wordnik)**
Get the word of the day, its definition, and origin ... +[svendittelli]: https://github.com/SVendittelli +[paviro]: https://github.com/paviro +[fcm]: https://github.com/paviro/MMM-FRITZ-Box-Callmonitor +[fr]: https://github.com/paviro/MMM-Facial-Recognition +[wl]: https://github.com/paviro/MMM-Wunderlist +[wn]: https://github.com/SVendittelli/MMM-wordnik ## Contributing From 5b34f7cf8c7502dd4f242daa054ba5fc67f41fc7 Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Thu, 7 Apr 2016 21:06:35 -0400 Subject: [PATCH 2/6] Markdown Love: Part II --- README.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 37751cc7..1244e993 100644 --- a/README.md +++ b/README.md @@ -61,19 +61,13 @@ The following modules are installed by default. The following modules are created by their respective authors. -| **Module Name** | **Author** | **Link** | -|------------------------ |------------------------------------------------ |------------------- | -| FRITZ!Box Call Monitor | Paul Vincent-Roll ([paviro](paviro)) | [Click Here](fcm) | -| Facial Recognition | Paul Vincent-Roll ([paviro](paviro)) | [Click Here](fr) | -| Wunderlist | Paul Vincent-Roll ([paviro](paviro)) | [Click Here](wl) | -| WordNik | Sam Vendittelli ([SVendittelli](svendittelli)) | [Click Here](wn) | +- **[MMM-FRITZ-Box-Callmonitor by PaViRo](https://github.com/paviro/MMM-FRITZ-Box-Callmonitor)**
FRITZ!Box Callmonitor (Display an alert when someone is calling ...) -[svendittelli]: https://github.com/SVendittelli -[paviro]: https://github.com/paviro -[fcm]: https://github.com/paviro/MMM-FRITZ-Box-Callmonitor -[fr]: https://github.com/paviro/MMM-Facial-Recognition -[wl]: https://github.com/paviro/MMM-Wunderlist -[wn]: https://github.com/SVendittelli/MMM-wordnik +- **[MMM-Facial-Recognition by PaViRo](https://github.com/paviro/MMM-Facial-Recognition)**
Facial recognition and module swapping based on the current user ... + +- **[MMM-Wunderlist by PaViRo](https://github.com/paviro/MMM-Wunderlist)**
Displays your Wunderlist todos on your mirror ... + +- **[MMM-wordnik by Vendittelli](https://github.com/SVendittelli/MMM-wordnik)**
Get the word of the day, its definition, and origin ... ## Contributing From d2cb0bde91eb1a7407f4d41db2b40b1e7ea61889 Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Thu, 7 Apr 2016 21:10:29 -0400 Subject: [PATCH 3/6] Fix Packages --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index fbe0faa1..fb3f6325 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,9 @@ }, "homepage": "https://github.com/MichMich/MagicMirror#readme", "devDependencies": { - "electron-prebuilt": "latest" + "electron-prebuilt": "latest", + "stylelint": "latest", + "stylelint-config-standard": "latest" }, "dependencies": { "express": "latest", @@ -34,8 +36,6 @@ "moment": "latest", "request": "latest", "socket.io": "latest", - "stylelint": "^5.2.1", - "stylelint-config-standard": "^4.0.1", "valid-url": "latest", "walk": "latest" } From 0ab1079c9ce39a0e45cb129c1682c052edd615d2 Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Thu, 7 Apr 2016 21:14:11 -0400 Subject: [PATCH 4/6] Markdown Love: Part III --- LICENSE | 21 --------------------- LICENSE.md | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.md diff --git a/LICENSE b/LICENSE deleted file mode 100644 index de5cf3da..00000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2016 - Michael Teeuw - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..d4765af2 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,18 @@ +The MIT License (MIT) +===================== + +Copyright © 2016 Michael Teeuw + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the “Software”), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +**The software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.** From af34dc4d4de514b93ce0b403ebca57468d3160ad Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Thu, 7 Apr 2016 21:19:29 -0400 Subject: [PATCH 5/6] HTML Love --- index.html | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index 6e2940e6..a6d7265c 100644 --- a/index.html +++ b/index.html @@ -1,36 +1,32 @@ + Magic Mirror - + + -
-
-
- +

-
-
- From f280aa227eed0932f66b8c07162ac24ab82d3e0e Mon Sep 17 00:00:00 2001 From: Nicholas Hubbard Date: Thu, 7 Apr 2016 21:20:34 -0400 Subject: [PATCH 6/6] Update Alert Spelling --- modules/default/alert/alert.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index 561eeebf..1a8c55dd 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -18,7 +18,7 @@ Module.register("alert",{ //Position position: "center", //shown at startup - welcome_message: "Welcome, start was successfull!" + welcome_message: "Welcome, start was successful!" }, getScripts: function() { return ["classie.js", "modernizr.custom.js", "notificationFx.js"];