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

1897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
E:V:A
155fb16a8a
Update README.md 
Updated README by reformatting and restructuring.
- Added, Clarified and corrected grammatics and wrong info 
- Moved/Removed some redundant parts
 2018-01-23 10:44:55 +02:00
Michael Teeuw
b1ab2ce96a
Merge pull request #1146 from cederstrom/put-article-in-front-of-modules 
Put article iframe in front of modules
 2018-01-21 11:33:22 +01:00
Andreas Cederström
f299ba6218 Put article ifram in front of modules 
Before this change the article was brought up in its ifram in fullscreen and you could still see the other modules in front of it
 2018-01-20 23:46:58 +01:00
Michael Teeuw
d167ad1923
Merge pull request #1136 from E3V3A/patch-2 
Update README
 2018-01-19 09:15:54 +01:00
E:V:A
93626e8154
Fixed bullet points markup for lint 2018-01-19 09:13:59 +02:00
Michael Teeuw
d5040c091a
Merge pull request #1143 from shbatm/bug-fix 
Fix for #1140 - sendNotification module errors after #1116
 2018-01-18 13:35:47 +01:00
shbatm
868daef0f0 Fix for #1140 - sendNotification module errors after #1116 2018-01-17 09:49:17 -06:00
Michael Teeuw
dc8e85e7f2
Merge pull request #1139 from amcolash/patch-1 
Change English translation to "In 2 days"
 2018-01-16 09:20:57 +01:00
Michael Teeuw
22d32d7ca3
Merge pull request #1141 from ConnorChristie/old-dom-event-fix 
Fix to emit DOM_OBJECTS_CREATED event after module DOMs have actually loaded
 2018-01-16 09:20:39 +01:00
Connor Christie
2d500f8074 Fix to emit DOM_OBJECTS_CREATED event after module DOMs have actually loaded 2018-01-14 22:03:09 -06:00
Andrew McOlash
452cdc17c6
Change English translation to "In 2 days" 2018-01-14 15:52:15 -06:00
E:V:A
bcbfee0321
Update README 
Updated README to warn about long installation time as discussed in #1124.
 2018-01-12 10:00:35 +02:00
Michael Teeuw
dab2e7ede3
Merge pull request #1127 from roramirez/set-version-test-7-node 
Set only 7 version of node to run tests in Travis CI
 2018-01-08 11:26:25 +01:00
Michael Teeuw
d91acb8352
Merge pull request #1126 from d-Rickyy-b/patch-1 
Fix typo in newsfeed documentation
 2018-01-08 11:23:49 +01:00
Rodrigo Ramírez Norambuena
373dd8058e Set only 7 version of node to run tests in Travis CI 2018-01-07 01:03:00 -03:00
Rico
de6310e52a
Fix typo 
A little typo which lead to poor formatting
 2018-01-07 03:30:01 +01:00
Michael Teeuw
8c297a4a4c
Merge pull request #1123 from E3V3A/patch-1 
Added general advice
 2018-01-06 19:49:44 +01:00
E:V:A
4eb5c817bc
fixed typos 2018-01-06 20:19:43 +02:00
E:V:A
07e4b26b9e
Added general advice 2018-01-06 19:57:46 +02:00
Michael Teeuw
b63aa62985
Merge pull request #1121 from henrikra/master 
Add basic typescript types for module
 2018-01-06 14:29:52 +01:00
Henrik Raitasola
ca701c0580 Merge branch 'master' of github.com:henrikra/MagicMirror 2018-01-06 15:26:51 +02:00
Henrik Raitasola
e37043a6a8 Solve conflict 2018-01-06 15:26:38 +02:00
Michael Teeuw
7c26975d14
Merge branch 'develop' into master 2018-01-06 14:16:21 +01:00
Henrik Raitasola
47f8a43637 Add changelog 2018-01-06 15:10:10 +02:00
Henrik Raitasola
1238c0cefe Rename file to be more explicit 2018-01-06 15:06:58 +02:00
Henrik Raitasola
4c35fda045 Add most used module properties 2018-01-06 15:04:54 +02:00
Henrik Raitasola
780124c2f5 Add basic types to get started 2018-01-06 14:51:32 +02:00
Michael Teeuw
38e0af41ce
Merge pull request #1116 from ConnorChristie/async-dom 
DOM creation notifications in cases of async template rendering
 2018-01-04 21:51:13 +01:00
Connor Christie
601e99eec0
Merge branch 'develop' into async-dom 2018-01-02 18:10:07 -06:00
Connor Christie
745a2adee7
Merge branch 'develop' into async-dom 2018-01-02 18:08:55 -06:00
Connor Christie
9e83234df1 Update changelog 2018-01-02 18:06:21 -06:00
Connor Christie
e45eeadf7d Merge remote-tracking branch 'origin/master' into async-dom 2018-01-02 18:04:03 -06:00
Michael Teeuw
9a778cea6b Merge v2.2.2 changes. 2018-01-02 18:46:41 +01:00
Michael Teeuw
20823bfc87 Add missing package-lock.json. v2.2.2 2018-01-02 18:41:33 +01:00
Connor Christie
be3d703692 Fix linter errors 2018-01-01 10:55:39 -06:00
Connor Christie
e2df5739f0 Update module docs 2018-01-01 10:40:52 -06:00
Connor Christie
7bb11d6436 Add documentation regarding updates 2018-01-01 10:38:00 -06:00
Connor Christie
80b84212cc Add notification for module dom creation with async support 2018-01-01 10:23:15 -06:00
Connor Christie
4a1bee769b Add true module dom creation events 2018-01-01 09:42:34 -06:00
Michael Teeuw
de99a7aeaf Merge 2.2.1 changes. 2018-01-01 14:23:38 +01:00
Michael Teeuw
a0a02701b0 Update version number. v2.2.1 V2.2.1 2018-01-01 13:42:39 +01:00
Michael Teeuw
1314ae1555 Add info about v2.2.1 2018-01-01 13:40:39 +01:00
Michael Teeuw
67cf0e745c Fix linting errors. 2018-01-01 13:39:05 +01:00
Michael Teeuw
538a2acbf5 Fix linting errors. 2018-01-01 13:38:07 +01:00
Michael Teeuw
8d0e453666 Preparation for v2.3.0 release. 2018-01-01 12:59:28 +01:00
Michael Teeuw
ace04f0b30
Merge pull request #1115 from MichMich/develop 
Cleanup.
v2.2.0 		2018-01-01 12:48:22 +01:00
Michael Teeuw
f8e25d6c4a
Cleanup. 2018-01-01 12:47:54 +01:00
Michael Teeuw
b2bc43da4f
Merge pull request #1113 from MichMich/develop 
Release v2.2.0.
 2018-01-01 12:44:24 +01:00
Michael Teeuw
cb12e540d2 Add package lock. 2018-01-01 12:40:37 +01:00
Michael Teeuw
39955af2fa Upgrade packages. 2018-01-01 12:36:53 +01:00