kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 12:12:20 +00:00
Code Issues Projects Releases Wiki Activity
462 Commits 3 Branches 49 Tags
Commit Graph

462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul-Vincent Roll
1ab00ac804 Moved this.translate() to the instance methods 2016-04-24 23:14:24 +02:00
Michael Teeuw
7a3db8f670 Merge pull request #240 from paviro/patch-3 
Added translation fallback note to documentation
 2016-04-24 23:07:35 +02:00
Paul-Vincent Roll
fd3676067a Added translation fallback note to documentation 2016-04-24 23:06:49 +02:00
Michael Teeuw
de61e4bf8c Merge pull request #239 from roxasvalor/v2-beta 
Fixed module Readmes for #237
 2016-04-24 23:05:24 +02:00
roxasvalor
3d0de834e0 Units now configured by config.js 2016-04-24 16:01:27 -05:00
roxasvalor
a897772df2 Units now configured by config.js 2016-04-24 16:00:13 -05:00
Michael Teeuw
5726d796f9 Merge pull request #237 from roxasvalor/v2-beta 
Added option for units inside of config.js
 2016-04-24 22:56:19 +02:00
roxasvalor
8381960737 Added "units" configuration instructions 
Added instructions for configuring the units variable in config.js.
 2016-04-24 15:38:50 -05:00
Michael Teeuw
b61d41f569 Merge pull request #238 from paviro/patch-3 
Added getTranslations() to the documentation
 2016-04-24 22:34:29 +02:00
Paul-Vincent Roll
af827b5645 Added getTranslations() to the documentation 2016-04-24 22:33:30 +02:00
roxasvalor
13a01d76f7 Added default units variable 
Added a default units variable if users do not configure in config.js.
 2016-04-24 15:33:22 -05:00
roxasvalor
2007f5ece4 Units from config.js 2016-04-24 15:25:35 -05:00
roxasvalor
a91a2c2609 Units configurable from Config.js 2016-04-24 15:24:44 -05:00
roxasvalor
0890fd521e Added units variable 2016-04-24 15:23:07 -05:00
Michael Teeuw
4338cb305d Merge pull request #235 from paviro/patch-2 
Wheezy supported
 2016-04-24 14:20:30 +02:00
Paul-Vincent Roll
84e02c828f Wheezy is supported now isn't it? 2016-04-24 14:18:41 +02:00
Michael Teeuw
be8707570c Merge pull request #234 from paviro/patch-1 
custom.css will be ignored
 2016-04-24 13:59:14 +02:00
Paul-Vincent Roll
39602e0a98 Update custom.css 2016-04-24 13:53:21 +02:00
Michael Teeuw
bc2f2f5323 Merge pull request #229 from djsunrise19/v2-beta 
Update README.md
 2016-04-23 20:28:58 +02:00
djsunrise19
66e71282a0 Update README.md 
Not necessary anymore, because we made that with "de.json" in calendar
 2016-04-23 20:26:05 +02:00
Michael Teeuw
bca56f88af Merge pull request #228 from djsunrise19/v2-beta 
Update de.json in calendar
 2016-04-23 20:17:51 +02:00
djsunrise19
35068631ec Merge pull request #1 from djsunrise19/djsunrise19-patch-1 
Update de.json
 2016-04-23 17:45:58 +02:00
Michael Teeuw
bd9557b11e Prevent display of events in the past. #162 2016-04-23 17:40:46 +02:00
djsunrise19
0f2c19f40f Update de.json 
"Noch" is grammatically better than "Endet in" for running events.
 2016-04-23 17:36:59 +02:00
Michael Teeuw
4248ae7792 Merge pull request #225 from paviro/v2-beta 
Added translaions to the alert module
 2016-04-23 17:32:06 +02:00
Paul-Vincent Roll
535a4205b1
Added translaions to the alert module. 2016-04-23 17:27:36 +02:00
Michael Teeuw
ab14fc8440 fix #223 2016-04-23 17:20:58 +02:00
Paul-Vincent Roll
86eea16271 Merge pull request #20 from MichMich/v2-beta 
Fix for #222
 2016-04-23 16:58:53 +02:00
Michael Teeuw
52a9caa96e Fix for #222 2016-04-23 16:57:03 +02:00
Paul-Vincent Roll
d8fe1a6e44 Merge pull request #19 from MichMich/v2-beta 
Update from Master
 2016-04-23 16:22:51 +02:00
Michael Teeuw
ae86090a03 Update to Node 5.11 2016-04-22 19:21:50 +02:00
Michael Teeuw
87aa887b2f Fix missing module. 2016-04-22 08:32:07 +02:00
Michael Teeuw
81378b5e25 Add update information. 2016-04-21 09:16:53 +02:00
Michael Teeuw
6f615b8202 Add NL translation & Convert config property to lowercase. 2016-04-21 09:02:41 +02:00
Michael Teeuw
44c1266a8c Merge pull request #211 from CFenner/l10n 
implements l10n
 2016-04-21 08:53:10 +02:00
Christopher
920f720699 fix indent 2016-04-21 08:47:07 +02:00
Christopher
a7c394de6c use translator 2016-04-21 01:04:00 +02:00
Christopher
4529675ca6 add l18n ability 
fixes #191
 2016-04-21 01:03:26 +02:00
Christopher
935909f24b fix typo 2016-04-20 23:13:31 +02:00
Christopher
7b61a0253c Merge branch 'v2-beta' into v2 2016-04-20 22:51:23 +02:00
Michael Teeuw
64e039cf8f Show 'tomorrow' when a full day event is planned for tomorrow. 2016-04-20 21:40:56 +02:00
Paul-Vincent Roll
65ae1f6f5a Merge pull request #18 from MichMich/v2-beta 
Update form Master
 2016-04-20 15:22:22 +02:00
Michael Teeuw
fa38ad3a74 Fix for #207 2016-04-20 15:19:36 +02:00
Michael Teeuw
fd500ac411 Allow the subscription to multiple news feeds in one newsfeed instance. 2016-04-20 14:39:38 +02:00
Paul-Vincent Roll
c6b5bb84e9 Merge pull request #17 from MichMich/v2-beta 
V2 beta
 2016-04-20 14:26:36 +02:00
Michael Teeuw
3b1f1a41dc Fix period display when using 24 hour mode. 2016-04-20 12:16:41 +02:00
Michael Teeuw
d778f2dd8b fix: #206 2016-04-20 11:42:01 +02:00
Michael Teeuw
287452169b Fix for #197 and #185 2016-04-20 11:32:48 +02:00
Michael Teeuw
6fdcd7f7e9 Add darkTheme. 2016-04-19 20:26:22 +02:00
Michael Teeuw
b16a49109f Possible fix for #185 2016-04-19 16:45:57 +02:00