kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-10-31 02:36:47 +00:00
Code Issues Projects Releases Wiki Activity
3,996 Commits 3 Branches 51 Tags
40c1521591f49bd9fb4b33cd9018a3e82c91bddc
Commit Graph

3996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Teeuw
78346cda46 Update latest version. 2016-04-06 16:20:34 +02:00
Michael Teeuw
c547ab4570 Merge pull request #142 from nhubbard/v2-beta 
Standardization and Issue Fixes
 2016-04-05 22:05:11 +02:00
Nicholas Hubbard
939b54787e Update installation script. 
- (possibly?) Fix issue that sha256sum does not work.
- Add shebang for good reasons.
- Fix continuing even after an error happens.
 2016-04-05 15:52:10 -04:00
Nicholas Hubbard
7b5b81504b Standardize: TO STYLELINT! 2016-04-05 15:43:52 -04:00
Michael Teeuw
5578a274f6 Merge pull request #141 from CFenner/npmStart2 
describe how to run npm start on SHH
 2016-04-05 21:43:01 +02:00
Christopher
9e0c4a89f3 add comment about ssh & npm start 2016-04-05 21:39:56 +02:00
Nicholas Hubbard
426728058c Standardize: TO JSCS! 2016-04-05 14:35:11 -04:00
Michael Teeuw
18390503b5 Merge pull request #139 from SVendittelli/v2-beta 
Add MMM-wordnik to README
 2016-04-05 16:29:22 +02:00
Sam Vendittelli
6e79b8404a Add MMM-wordnik to the README 2016-04-05 15:24:46 +01:00
Sam Vendittelli
4567272baa Merge pull request #1 from MichMich/v2-beta 
V2 beta
 2016-04-05 15:01:36 +01:00
Michael Teeuw
6ff3a37665 Prevent memory leaks. 2016-04-05 14:54:40 +02:00
Michael Teeuw
5420314784 Register the express app to allow registration of urls. 2016-04-05 14:22:34 +02:00
Michael Teeuw
f1dad4c9fb Merge pull request #138 from paviro/v2-beta 
Change slide position based on notification position - closes #137
 2016-04-05 13:47:57 +02:00
Paul-Vincent Roll
aba0b29c77 Change slide position based on notification position - closes #137 2016-04-05 13:45:18 +02:00
Michael Teeuw
638263e8eb Add two special regions. 2016-04-05 13:39:52 +02:00
Michael Teeuw
e2040b7194 Remove old version. 2016-04-05 13:33:59 +02:00
Paul-Vincent Roll
0006e3b4bd Merge pull request #15 from MichMich/v2-beta 
Update from Master
 2016-04-05 13:24:38 +02:00
Michael Teeuw
06efd01032 Configurable encoding. #126 2016-04-05 13:16:23 +02:00
Michael Teeuw
1a20bd2f4d add an align-left class 2016-04-05 12:22:01 +02:00
Michael Teeuw
598cf61eb4 Fix Facebook Birthdays - Fix: #97 2016-04-05 11:20:47 +02:00
Michael Teeuw
7b6772e77b Allow custom css styling. 2016-04-05 10:26:18 +02:00
Michael Teeuw
c4bfa6d4d8 Finish loading empty calendars. Fixes issue: #124 2016-04-05 10:01:54 +02:00
Michael Teeuw
700ebc53f8 Merge pull request #135 from Domi-G/v2-beta 
Font Improvements - closes #133
 2016-04-05 09:44:35 +02:00
Domi-G
4db83293e5 Reorder the fonts for optimized loading 2016-04-05 00:35:30 +02:00
Domi-G
0fcdc2e118 Define fallback fonts 2016-04-05 00:33:29 +02:00
Domi-G
4b8d44aa2e Cleanup fonts, larger charset - fixes #133 2016-04-05 00:09:11 +02:00
Michael Teeuw
915e716936 Merge pull request #134 from nhubbard/v2-beta 
Clean up the project's README and installation instructions.
 2016-04-04 20:25:15 +02:00
Nicholas Hubbard
bb63232f55 Update the installer to allow condensed installation. 
Condensed installation is where the user Git Clones the repo and runs the installer there.
 2016-04-04 13:57:09 -04:00
Nicholas Hubbard
43288b2e97 Update the README for better disclosure of installation script. 2016-04-04 13:54:49 -04:00
Nicholas Hubbard
824eade8b2 Update installation script for Pi 3 support. 2016-04-04 12:28:07 -04:00
Nicholas Hubbard
df26058172 Add installation script for ease of installation. 2016-04-04 12:19:13 -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
a4d5b74b57 Fixes encoding issues: #125 & #126 2016-04-03 23:16:59 +02:00
Michael Teeuw
864106d336 Merge pull request #132 from paviro/v2-beta 
Fixed mistake that happens when no type is given
 2016-04-03 20:43:35 +02:00
Paul-Vincent Roll
5a612e792e Fixed mistake that happens when no type is given 2016-04-03 20:41:03 +02:00
Michael Teeuw
e473dfc15e Merge pull request #131 from paviro/v2-beta 
Use SHOW_ALERT for all type of notifications
 2016-04-03 20:36:18 +02:00
Paul-Vincent Roll
f931316dc8 No type = alert 2016-04-03 20:34:47 +02:00
Paul-Vincent Roll
e323a315e1 README ms not seconds 2016-04-03 20:31:09 +02:00
Paul-Vincent Roll
a55a2bcca0 Use SHOW_ALERT for all type of notifications 2016-04-03 20:28:51 +02:00
Michael Teeuw
f0c739c94c Add Contributing. 2016-04-03 20:27:56 +02:00
Michael Teeuw
60db5abb54 Change default port to port 8080. 2016-04-03 20:27:56 +02:00
Michael Teeuw
9ab7356730 Merge pull request #130 from paviro/v2-beta 
Removed no longer existing params
 2016-04-03 20:15:50 +02:00
Paul-Vincent Roll
7f2537f9b1 Removed no longer existing params 2016-04-03 20:13:22 +02:00
Michael Teeuw
6fe3ca1058 Merge pull request #129 from paviro/v2-beta 
Added alert todos
 2016-04-03 20:12:34 +02:00
Paul-Vincent Roll
99dbb3abed Added alert todos 2016-04-03 20:08:22 +02:00
Paul-Vincent Roll
053bdd0467 Merge pull request #14 from MichMich/v2-beta 
Update from Master
 2016-04-03 20:05:55 +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