kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2026-06-16 04:35:08 +00:00
Code Issues Projects Releases Wiki Activity
137 Commits 3 Branches 54 Tags
29db2dcd144d52d21cc575ef00aae9738de9e74b
Commit Graph

137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Teeuw 6b30d20de6 Merge pull request #43 from nhubbard2/master 
Modularize all server-side components
 2016-01-08 11:01:16 +01:00
Nicholas Hubbard a68be5e096 Delete calendar.php 2016-01-07 15:36:38 -05:00
Nicholas Hubbard 2005a04469 Delete githash.php 2016-01-07 15:36:31 -05:00
Nicholas Hubbard 1a8c3387fe Update version.js 2016-01-07 15:34:45 -05:00
Nicholas Hubbard edde3320f0 Update calendar.js 2016-01-07 15:34:24 -05:00
Nicholas Hubbard 0387618e40 Create gzip.php 2016-01-07 15:33:18 -05:00
Nicholas Hubbard 4d73bfcf72 Create calendar.php 2016-01-07 15:26:07 -05:00
Nicholas Hubbard d6496c22d8 Create hash.php 2016-01-07 15:24:49 -05:00
Michael Teeuw e68032904b Merge pull request #42 from paviro/master 
Updated README
 2015-12-20 20:47:43 +01:00
Paul-Vincent Roll 38843d81b0 Updated README 2015-12-20 20:45:15 +01:00
Paul-Vincent Roll b66289acde Merge remote-tracking branch 'MichMich/master' 2015-12-20 20:38:38 +01:00
Michael Teeuw 2ff3b6d541 Merge pull request #41 from paviro/master 
Added calendar URL to config
 2015-12-19 21:18:58 +01:00
Paul-Vincent Roll 6921f0f800 Added calendar URL to config 2015-12-19 21:03:44 +01:00
vagrant d3d2099b01 fix windspeed calculation 2015-12-11 16:12:04 +00:00
Michael Teeuw 0d4164a03e Fix calendar sorting. 2015-11-20 10:39:44 +01:00
Michael Teeuw 736bf55bd8 Add option to configure maximum number of calendar entries. 2015-11-06 13:38:31 +01:00
Michael Teeuw 9a5a74e153 Merge pull request #34 from MichMich/pr/30 
Update for compliments.
 2015-11-03 14:25:16 +01:00
Michael Teeuw e0de5667f9 Increase update time for compliments. 2015-11-03 14:22:46 +01:00
Michael Teeuw cf95a2e431 Fix for Compliment picker. 
Fixes bug where compliments were no longer updated.
 2015-11-03 14:22:31 +01:00
Michael Teeuw 067ef7ecba Merge pull request #32 from LithiumNL/patch-1 
Update weather.js
 2015-11-01 18:45:32 +01:00
LithiumNL 92032c572a Update weather.js 
The sunset icon was never displayed because the if statement was different. The sunset and sunrise were are in HH:MM and now in another timestamp.
_sunset > now should be _sunset > _now
 2015-11-01 18:27:21 +01:00
Michael Teeuw 77c9c5d006 Merge pull request #31 from MichMich/pr/30 
Merge of Pr/30
 2015-10-30 12:38:59 +01:00
Michael Teeuw a00da4e40c Update readme.md 2015-10-30 12:36:41 +01:00
Jon Heller 574a686eab update README.md with simple info about files 2015-10-23 17:03:24 -04:00
Jon Heller b618f46d5e add comments to weather.js 2015-10-23 17:02:25 -04:00
Jon Heller e3b33913ed add comments to version.js 2015-10-23 17:02:15 -04:00
Jon Heller 328db24bee add comments to time.js 2015-10-23 17:02:03 -04:00