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

534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Teeuw
65923abcae Add travis shield. 2016-05-11 13:54:52 +02:00
Michael Teeuw
c4f3009bb5 Add suspend and resume methods. 2016-05-11 13:49:40 +02:00
Michael Teeuw
405a81c8f0 Translation info. 2016-05-11 12:42:36 +02:00
Michael Teeuw
7a067a0f6e Finish translation system. #191 2016-05-11 12:38:41 +02:00
Michael Teeuw
32c9f197b1 Fix wind direction. #303 2016-05-11 09:25:16 +02:00
Michael Teeuw
85151b23d3 Add user agent to request. Fix: 231 2016-05-11 09:07:10 +02:00
Michael Teeuw
fc0a4d90df Merge pull request #304 from KirAsh4/v2-beta 
V2 beta [Calendar Module]: Time display options
 2016-05-10 22:42:01 +02:00
Ashley M. Kirchner
9558616f59 Minor text changes, and updating README file 2016-05-10 11:58:05 -06:00
Michael Teeuw
5be5741ac3 Possible fix for #181 2016-05-10 16:18:35 +02:00
Michael Teeuw
80c0e6a4e0 Add support for (some) Atom feeds. #231 2016-05-10 13:35:13 +02:00
Michael Teeuw
9bc8f54233 Fix issue with calendar events without title. #221 2016-05-10 12:24:49 +02:00
Ashley M. Kirchner
a4c02cef54 Absolute or Relative time display on Calendar module 
User can now choose between an 'absolute' or 'relative time display on
events. Furthermore, when set to 'absolute', there's an option to set an
'urgency' range of days and only those events within that period will be
displayed with a relative time (in x days) while all others will have an
absolute date.
 2016-05-10 01:01:00 -06:00
Ashley M. Kirchner
935f4132ab Filemode changes? 2016-05-10 00:46:21 -06:00
Michael Teeuw
a1cb82e7db Merge pull request #296 from paviro/v2-beta 
Use node v5.9.1
 2016-05-06 16:58:13 +02:00
Paul-Vincent Roll
146d782729
Use node v5.9.1 2016-05-06 16:57:14 +02:00
Paul-Vincent Roll
ac8bf5e939 Merge pull request #22 from MichMich/v2-beta 
Update from Master
 2016-05-06 16:55:09 +02:00
Michael Teeuw
2a70620844 Typo. 2016-05-06 11:29:17 +02:00
Michael Teeuw
7494b867a7 Merge pull request #291 from jordi2830/patch-1 
Fixing the hardcoded Node.js version number
 2016-05-05 19:14:52 +02:00
Jordi De Poortere
2874ee8609 Fixing the hardcoded Node.js version number 2016-05-05 19:12:35 +02:00
Michael Teeuw
e61145eabe Merge pull request #289 from paviro/patch-5 
Added module showcase link.
 2016-05-04 15:26:20 +02:00
Paul-Vincent Roll
4f01c574d2 Added module showcase link. 2016-05-04 15:25:23 +02:00
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