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

513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Teeuw
06a471033c Merge pull request #287 from nhubbard/v2-beta 
Close #281: ESLint and using the force, Luke
 2016-05-04 07:19:56 +02:00
Michael Teeuw
3761bfd26f Merge pull request #286 from roxasvalor/v2-beta 
Added option for using the Beaufort scale or raw wind speed
 2016-05-04 07:17:26 +02:00
roxasvalor
07ad1b1de4 Update Readme for useBeaufort option 2016-05-03 19:21:58 -05:00
Warwolf8.9
5725af55a8 Make Beaufort wind speed optional 2016-05-03 19:14:27 -05:00
Nicholas Hubbard
d0f75ffda9
TravisFix2 2016-05-03 20:00:32 -04:00
Nicholas Hubbard
4117938140
Merge branch 'v2-beta' of https://github.com/nhubbard/MagicMirror into v2-beta 2016-05-03 19:56:28 -04:00
Nicholas Hubbard
f50c206d4f
Travis fixer. 2016-05-03 19:56:14 -04:00
Nicholas Hubbard
ed95cb791c Force Travis 2016-05-03 19:52:49 -04:00
Nicholas Hubbard
9d0bf6d409
Grunt and Travis, you\'re late 2016-05-03 19:51:07 -04:00
roxasvalor
5e68a8200d Merge pull request #1 from MichMich/v2-beta 
V2 beta
 2016-05-03 18:38:38 -05:00
Nicholas Hubbard
15887994fe
JSCS Says Goodbye 2016-05-03 19:13:46 -04:00
Michael Teeuw
8bec8281d2 Merge pull request #285 from danito/v2-beta 
V2 beta - module calendar - french translation
 2016-05-03 17:07:05 +02:00
Daniel nix
2e5a5812a9 Update calendar.js 
add fr translation for calendar
 2016-05-03 17:04:45 +02:00
Daniel nix
744f9316a9 Create fr.json 
adding fr translation
 2016-05-03 17:01:48 +02:00
Michael Teeuw
a6da9e8943 Fix #283 2016-05-03 16:59:18 +02:00
Michael Teeuw
14d3bb273c Load custom.css after the modules. Fix: #284 2016-05-03 16:42:09 +02:00
Michael Teeuw
37f8c0783d Fix facebook dates. #271 2016-05-03 11:56:24 +02:00
Michael Teeuw
05a946e2bf Formatting. 2016-05-03 11:19:01 +02:00
Michael Teeuw
a1b3e0778a Add info about malformed config files. Fix: #249 2016-05-03 11:18:06 +02:00
Michael Teeuw
93f8ade350 Merge pull request #253 from momo13292/v2-beta 
calendar events repeating count title for birthdayd etc
 2016-05-02 19:36:51 +02:00
momo13292
2a3a942b8e Delete nohup.out 2016-05-02 19:32:18 +02:00
Michael Teeuw
796583c0be Merge pull request #280 from paviro/v2-beta 
Added forum to README
 2016-05-02 17:10:39 +02:00
Paul-Vincent Roll
df31b56cf3
Added forum to README. 2016-05-02 17:02:03 +02:00
Paul-Vincent Roll
e5f4446c82 Merge pull request #21 from MichMich/v2-beta 
Update from Master
 2016-05-02 16:50:05 +02:00
Michael Teeuw
0252495eca Missing , 2016-05-01 23:30:01 +02:00
Michael Teeuw
5e75a6b4a0 Merge pull request #276 from nhubbard/v2-beta 
Extend the Logger
 2016-05-01 19:54:44 +02:00
Michael Teeuw
3002a4f9b3 Merge pull request #274 from KirAsh4/v2-beta 
V2 beta - weatherforecast maxNumberOfDays
 2016-05-01 19:53:46 +02:00
Nicholas Hubbard
f627c5e5a1 Extend the Logger 
Add Timing, Grouping, and Warning to the logger.
 2016-05-01 13:46:41 -04:00
Ashley M. Kirchner
4d0a93fc3b Update README.md 
Added the maxNumberOfDays config option to change the amount of forecasted days returned by the OpenWeatherAPI.
 2016-04-29 12:58:03 -06:00
Ashley M. Kirchner
3f040e7744 Update weatherforecast.js 
Added the option to change the amount of forecasted days returned by the OpenWeatherAPI.
 2016-04-29 12:52:10 -06:00
Michael Teeuw
e572d544ef Merge pull request #269 from nhubbard/v2-beta 
clockBold's Re-Incarnation
 2016-04-29 18:55:55 +02:00
Nicholas Hubbard
ab3f585a2b
clockBold's Re-Incarnation: Part II 2016-04-29 11:25:05 -04:00
Nicholas Hubbard
8b792c5fe0
clockBold's Re-Incarnation: Part I 2016-04-29 11:24:14 -04:00
Michael Teeuw
f184116824 Remove slack. 2016-04-27 14:39:21 +02:00
Michael Teeuw
ab2c91ba20 Add slack channel (experimental) 2016-04-27 14:37:12 +02:00
Michael Teeuw
f2a786254e Merge pull request #256 from djsunrise19/v2-beta 
Update de.json
 2016-04-27 11:05:19 +02:00
djsunrise19
7cbc8a0ede Update de.json 
Cause ´morgen um ***` and other words are written lowercased, it makes sense to write ´noch` lowercased too. Days und whole day events have to be as they are.
 2016-04-27 10:45:15 +02:00
Michael Teeuw
08bc644de1 Fix #245 2016-04-27 09:42:13 +02:00
Michael Teeuw
f12125f2a4 Update to node 6.0.0 2016-04-27 09:37:44 +02:00
Mona Schüch
4e86de7fc2 calendar events repeating count title for birthdayd etc 2016-04-26 22:34:12 +02:00
Michael Teeuw
38796a0d40 Merge pull request #243 from roxasvalor/v2-beta 
Add optional wind direction in currentweather module
 2016-04-25 13:27:59 +02:00
roxasvalor
8562bdfc4a Removed trailing comma 2016-04-25 06:27:26 -05:00
roxasvalor
74c96d8521 Removed showWindDirection 2016-04-25 06:23:55 -05:00
roxasvalor
5f8ef64ca4 showDirection to showWindDirection 2016-04-24 18:34:39 -05:00
roxasvalor
5a5f5318d1 Update README.md 2016-04-24 18:31:46 -05:00
roxasvalor
db9e615e4d Update README.md 2016-04-24 18:30:54 -05:00
Warwolf8.9
2aae0528b5 Added wind direction in Current Weather module 2016-04-24 18:06:12 -05:00
roxasvalor
8d29bd5c32 Update currentweather.js 2016-04-24 17:40:18 -05:00
roxasvalor
77cb8530e5 Update currentweather.js 2016-04-24 16:55:39 -05:00
Michael Teeuw
bfd7404c85 Merge pull request #241 from paviro/patch-4 
Moved this.translate() to the instance methods
 2016-04-24 23:21:22 +02:00