kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity
1,009 Commits 3 Branches 49 Tags
Commit Graph

111 Commits

Author SHA1 Message Date
Nicholas Hubbard
6232bf070d Update README.md 2016-04-10 16:07:47 -04:00
Nicholas Hubbard
978b0ed811 Update README.md 2016-04-10 16:07:30 -04:00
Nicholas Hubbard
24acd14da0 Update README 
Add centering.
 2016-04-10 16:07:10 -04:00
Michael Teeuw
f25da27c58 Add header, add wiki links. 2016-04-10 20:39:42 +02:00
Michael Teeuw
bee04bec44 Add link to documentation. 2016-04-09 20:58:07 +02:00
Michael Teeuw
880e2401e1 Merge pull request #152 from nhubbard/v2-beta 
Update Contributions
 2016-04-09 20:32:44 +02:00
Michael Teeuw
86a0b5f59a change header description. 2016-04-09 17:58:57 +02:00
Michael Teeuw
becf029583 Add header info. 2016-04-09 17:58:10 +02:00
Michael Teeuw
faa6d91f7c Add ordering information. 2016-04-09 16:00:34 +02:00
Michael Teeuw
be5ecc6d0d Add configuration instructions. 2016-04-09 15:59:05 +02:00
Michael Teeuw
29fc705672 Minor change. 2016-04-09 15:15:27 +02:00
Michael Teeuw
2859db15fe Update install instructions. 2016-04-09 15:14:01 +02:00
Nicholas Hubbard
56c94a2986 Contribution: Part I 2016-04-08 20:45:14 -04:00
Michael Teeuw
a34a5c4db0 Separate server core from Electron. 2016-04-08 22:16:22 +02:00
Michael Teeuw
0441b9fb50 Update README.md 2016-04-08 20:24:08 +02:00
Nicholas Hubbard
5b34f7cf8c Markdown Love: Part II 2016-04-07 21:06:35 -04:00
Nicholas Hubbard
9e6e34eda0 Markdown Love: Part I 2016-04-07 21:04:24 -04:00
Christopher
9e0c4a89f3 add comment about ssh & npm start 2016-04-05 21:39:56 +02:00
Sam Vendittelli
6e79b8404a Add MMM-wordnik to the README 2016-04-05 15:24:46 +01:00
Nicholas Hubbard
43288b2e97 Update the README for better disclosure of installation script. 2016-04-04 13:54:49 -04:00
Nicholas Hubbard
2f3219704e Add badges and fix Usage list formatting. 2016-04-03 20:39:01 -04:00
Nicholas Hubbard
5c0532e6c6 Some branding, grammar and spelling updates. 2016-04-03 19:43:31 -04:00
Michael Teeuw
f0c739c94c Add Contributing. 2016-04-03 20:27:56 +02:00
Paul-Vincent Roll
99dbb3abed Added alert todos 2016-04-03 20:08:22 +02:00
Michael Teeuw
5554dce924 Fix merge conflict. 2016-04-03 19:56:01 +02:00
Michael Teeuw
ec7a4734df Merge branch 'v2-beta' of https://github.com/MichMich/MagicMirror into pr/120 
# Conflicts:
#	README.md
 2016-04-03 19:55:35 +02:00
Michael Teeuw
40e3e71b48 Fix merge conflict. 2016-04-03 19:53:36 +02:00
Michael Teeuw
5eed80c28e Squashed commit of the following: 
commit e38dd346d9f796807ea71035c18e3533ec245ba6
Author: Michael Teeuw <michael@xonaymedia.nl>
Date:   Sat Apr 2 19:17:30 2016 +0200

    Add the possibility to set the maximum number of days.

commit 6f5c86775b708d19d3798267ffd23e491a1d2c62
Author: Sam Vendittelli <sam.vendittelli@hotmail.com>
Date:   Sat Apr 2 06:27:44 2016 +0100

    Fixed cursor appearing in margin

    Cursor was appearing in the margin so moved `cursor: none` property to html.

commit 576c668d84b34b8ad7a0fd51b146fde60f721682
Author: Domi-G <lessuseguy+githubdomig@gmail.com>
Date:   Fri Apr 1 22:52:32 2016 +0200

    Huge cleanup of white space
 2016-04-03 19:52:13 +02:00
Paul-Vincent Roll
e2436ad796 Updated install instructions 2016-04-03 17:46:09 +02:00
Paul-Vincent Roll
5ecdca28fb Added Alert module to README 2016-04-03 13:02:49 +02:00
Domi-G
576c668d84 Huge cleanup of white space 2016-04-01 22:52:32 +02:00
Michael Teeuw
e4c54cc655 Add module subfolder support. 2016-04-01 17:35:29 +02:00
Michael Teeuw
671338425a Add module documentation. 2016-04-01 16:43:59 +02:00
Michael Teeuw
33586f4bdf Compliments documentation. 2016-04-01 16:02:59 +02:00
Michael Teeuw
44c0f409a9 Fix link. 2016-04-01 14:22:26 +02:00
Michael Teeuw
dde6d8e623 Link to documentation. 2016-04-01 14:21:23 +02:00
Paul-Vincent Roll
a381c91af7 Added alerts to todo 2016-04-01 12:23:07 +02:00
Michael Teeuw
62fcf8402c Add todo. 2016-04-01 10:47:16 +02:00
Paul-Vincent Roll
240487c258 Added MMM-Wunderlist to README 2016-04-01 02:24:06 +02:00
Michael Teeuw
05162ebd59 Update todo. 2016-03-31 14:20:43 +02:00
Paul-Vincent Roll
a14373a3e6 Added MMM-Facial-Recognition to README 2016-03-31 13:37:44 +02:00
Michael Teeuw
c1bd469086 updated readme 2016-03-31 11:08:06 +02:00
Michael Teeuw
b243d25399 Improved socket connection for node_helper. 2016-03-30 16:25:24 +02:00
Michael Teeuw
0d6ada13c4 Add module info to readme. 2016-03-30 15:20:14 +02:00
Paul-Vincent Roll
5bccb1a555 Added Callmonitor to README 2016-03-30 15:13:46 +02:00
Michael Teeuw
af910aa3f7 New node_helper loading. 2016-03-30 14:49:37 +02:00
Michael Teeuw
899d05bc32 Add server (web/socket), create socket system, better helper loader. 
- The Magic Mirror is now hosted via a express server, allowing you to
load it from an external client (for debugging.)
- It now includes a socket system to communicate between the
node_helper and the client module.
- node_helpers are now only loaded if the module is configured in the
config.
 2016-03-30 12:20:46 +02:00
Michael Teeuw
c09f8e97f7 Add news feed module. 2016-03-29 15:44:43 +02:00
Michael Teeuw
90c6283742 Add configuration instructions and todo. 2016-03-29 13:35:55 +02:00
Paul-Vincent Roll
2a41e55ff2 Updated README 2016-03-28 13:47:40 +02:00