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
4,914 Commits 3 Branches 49 Tags
Commit Graph

4914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Teeuw
d7ef4adbc8 update gitignore to ignore new modules (except default modules) 2016-03-30 14:59:57 +02:00
Paul-Vincent Roll
c89e5785d8 Merge pull request #2 from MichMich/v2-beta 
Update V2 beta from master
 2016-03-30 14:54:21 +02:00
Michael Teeuw
af910aa3f7 New node_helper loading. 2016-03-30 14:49:37 +02:00
Michael Teeuw
7e873880f5 fix git ignore 2016-03-30 14:00:42 +02:00
Michael Teeuw
1be0edaf03 git ignore fix 2016-03-30 13:57:06 +02:00
Michael Teeuw
609e498973 git ignore fix 2016-03-30 13:56:53 +02:00
Michael Teeuw
1585b7a142 add git ignore for modules/node_modules 2016-03-30 13:52:32 +02:00
Michael Teeuw
c55ac659c1 Git ignore changes. 2016-03-30 13:47:57 +02:00
Michael Teeuw
1de52f7b64 Update gitignore. 2016-03-30 13:44:49 +02:00
Michael Teeuw
26a6eb506e Allow use of class.js in node. 2016-03-30 13:44:16 +02:00
Michael Teeuw
ede3e669c7 Minor visual change. 2016-03-30 13:29:44 +02:00
Michael Teeuw
d00aa21c96 git ignore changes 2016-03-30 13:19:54 +02:00
Paul-Vincent Roll
6181098f68 Merge pull request #1 from MichMich/v2-beta 
Update from master v2 branch
 2016-03-30 12:57:27 +02:00
Michael Teeuw
1d4c1624c4 update package.json 2016-03-30 12:49:41 +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
15856574d7 Add fade option to weather forecast. 2016-03-29 16:10:50 +02:00
Michael Teeuw
c09f8e97f7 Add news feed module. 2016-03-29 15:44:43 +02:00
Michael Teeuw
4fb7f099de Output node_helper output to console. 2016-03-29 15:39:54 +02:00
Michael Teeuw
90c6283742 Add configuration instructions and todo. 2016-03-29 13:35:55 +02:00
Michael Teeuw
872d8584fb Git ignore changes. 2016-03-29 13:28:51 +02:00
Michael Teeuw
74afe433fb Add weather modules. 2016-03-29 13:28:15 +02:00
Michael Teeuw
e85d6a39f8 Merge pull request #108 from paviro/v2-beta 
Updated README
 2016-03-28 14:44:19 +02:00
Paul-Vincent Roll
2a41e55ff2 Updated README 2016-03-28 13:47:40 +02:00
Michael Teeuw
1e30811112 Merge pull request #107 from paviro/v2-beta 
Start helper_scripts as childs
 2016-03-28 13:25:46 +02:00
Paul-Vincent Roll
22f0d752ea Start helper_scripts as childs and not just import them into the main script 2016-03-28 13:23:02 +02:00
Michael Teeuw
4675bae804 Merge pull request #106 from paviro/v2-beta 
This seems to be working perfect. I didn't test it yet on a Pi, but since you say this works I merge the pull request. Thanks for your contribution!
 2016-03-28 12:17:51 +02:00
Paul-Vincent Roll
57bd3c5a4e Spelling mistake sorry... 2016-03-28 02:29:13 +02:00
Paul-Vincent Roll
29db2dcd14 Use latest electron version 2016-03-28 02:27:12 +02:00
Paul-Vincent Roll
df153ee1a1 Hide menu-bar on Raspberry Pi and some comments 2016-03-28 01:59:05 +02:00
Paul-Vincent Roll
331c12269c disable node-integration so jquery works again 2016-03-28 00:26:24 +02:00
Paul-Vincent Roll
d7844a1e39 electron now searches for node helper scripts on module folders 2016-03-27 22:22:04 +02:00
Paul-Vincent Roll
d96b82500a Added electron wrapper 2016-03-27 20:40:07 +02:00
Michael Teeuw
74f1da81f2 Initial version of the README. 2016-03-27 16:57:20 +02:00
Michael Teeuw
472bc529f9 Cleanup. 2016-03-24 18:13:09 +01:00
Michael Teeuw
4266c0b279 Initial commit of V2. 2016-03-24 17:19:32 +01:00
Michael Teeuw
c428d6a985 Merge pull request #52 from alaycock/patch-1 
Corrected tabbing for my previous pull request, sorry
 2016-01-20 14:20:51 +01:00
Michael Teeuw
0880bf7d8d Merge pull request #51 from plfstr/master 
Code Tidy
 2016-01-20 14:20:39 +01:00
Adam Laycock
1718479ba3 Corrected tabbing for my commit, sorry 2016-01-19 09:47:58 -07:00
Paul Foster
4c9191385d HTTPS News 2016-01-19 16:27:08 +00:00
Paul Foster
73ab803679 Merge remote-tracking branch 'MichMich/master' 2016-01-19 16:26:05 +00:00
Michael Teeuw
fbca3c9a0c Merge pull request #50 from alaycock/master 
Remove static date, replace with today + 1 year
 2016-01-19 09:51:49 +01:00
Adam
f64c2d3772 Remove static date, replace with today + 1 year 2016-01-18 20:40:47 -07:00
Michael Teeuw
91a57fdd88 Merge pull request #46 from nhubbard2/master 
Fix Issue #36
 2016-01-15 21:25:22 +01:00
Nicholas Hubbard
818d16521b Update gzip.php 2016-01-10 19:24:20 -05:00
Paul Foster
da004b3e64 Readme tweaks 2016-01-10 12:01:20 +00:00
Paul Foster
15e6c1c673 HTTPS YQL 2016-01-09 18:02:11 +00:00
Paul Foster
0e099aa87b Merge branch 'script-tidy' 2016-01-09 00:38:45 +00:00
Paul Foster
0e2d7f59d5 Merge branch 'css-tidy' 2016-01-09 00:38:11 +00:00
Paul Foster
843c6e9049 CSS tidy up 2016-01-09 00:36:15 +00:00
Paul Foster
f9f1cf423b Lose script type 2016-01-09 00:27:15 +00:00