kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2026-06-22 16:27:55 -07:00
Code Issues Projects Releases Wiki Activity
2,433 Commits 3 Branches 54 Tags
9bf0d4f804110ccc8fb7eff8d6d06dcfdbebc6dc
Commit Graph

2433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Teeuw 9bf0d4f804 Merge pull request #1580 from lavolp3/lavolp3-patch-1 
Changed defaut dateEndFormat
 2019-02-19 15:47:41 +01:00
Dirk 4443f57f8a Update CHANGELOG.md 2019-02-19 14:10:17 +01:00
Dirk feb5351ec3 changed default calendarEndDate to "LT" 
changed default calendarEndDate to "LT" to show local times for event end times. 
Can still be set to a different value by the user
 2019-02-19 14:07:01 +01:00
Michael Teeuw 7cc9a03db8 Merge pull request #1578 from lavolp3/splitDates 
Add "sliceMultiDayEvents" option in calendar module
 2019-02-19 09:13:33 +01:00
Dirk 2b2e8508d9 Update calendar.js 
Small updates for travis cr check
 2019-02-18 22:38:28 +01:00
Dirk a70716f225 Merge branch 'splitDates' of https://github.com/lavolp3/MagicMirror into splitDates 2019-02-18 21:11:58 +01:00
Dirk d9fcc46994 included split function to split multiday events 2019-02-18 21:11:24 +01:00
Dirk 2d8acec6f0 Update CHANGELOG.md 2019-02-18 21:04:56 +01:00
Dirk cd06d8c63a Merge pull request #5 from MichMich/develop 
Develop
 2019-02-18 21:02:46 +01:00
Michael Teeuw f7f4043ccd Merge pull request #1571 from kolbyjack/develop 
Fix null dereference in moduleNeedsUpdate when the module isn't visible
 2019-02-15 13:57:24 +01:00
Michael Teeuw b7b55173a6 Merge pull request #1573 from vincep5/develop 
weather module adjustments for rain and snow
 2019-02-15 13:56:58 +01:00
Michael Teeuw 954253c7e2 Remove Slack. 2019-02-15 11:15:06 +01:00
vincep5 cbe4d2cd7f weather module adjustments for rain and snow 2019-02-14 13:00:40 -06:00
vin p 40101129b5 Merge pull request #3 from MichMich/develop 
Develop
 2019-02-14 12:20:52 -06:00
Michael Teeuw 4bb32c6d09 Merge pull request #1514 from fwitte/features/weather_forecast_and_forecast_daily_support 
Add forecast and forecast/daily support to new weather module
 2019-02-14 17:41:10 +01:00
Michael Teeuw 6e09ceeda6 Merge branch 'develop' into features/weather_forecast_and_forecast_daily_support 2019-02-14 17:34:08 +01:00
fwitte d6a6a53623 updated weather icon display 2019-02-14 16:48:45 +01:00
Michael Teeuw 4a97052708 Fix linting error. 2019-02-14 13:50:16 +01:00
Jon Kolb 3a4902ad4a Fix null dereference in moduleNeedsUpdate when the module isn't visible 2019-02-14 00:06:45 +00:00
Michael Teeuw 77d14bc218 Add donation link. 2019-02-13 16:12:46 +01:00
Michael Teeuw 1d2a39a855 Merge pull request #1564 from jacob-ebey/develop 
Added autoLocation and autoTimezone option for weather modules and clock respectively.
 2019-02-13 09:46:25 +01:00
Michael Teeuw 98b53b6b3d Merge branch 'develop' into develop 2019-02-13 09:38:15 +01:00
Michael Teeuw 0148d8beaf Merge pull request #1565 from AnthonyBuisset/fix/calendar 
Fix exdate handling when multiple values are specified (comma separated)
 2019-02-13 09:37:06 +01:00
Michael Teeuw 5bfd84d3be Merge pull request #1567 from stefsims/patch-2 
Added danish translation
 2019-02-13 09:36:11 +01:00
Michael Teeuw 351eb95feb Merge pull request #1566 from stefsims/patch-1 
Update da.json
 2019-02-13 09:35:53 +01:00
stefsims 56788f0933 Update CHANGELOG.md 
Added danish translation
 2019-02-11 09:02:42 +01:00
stefsims 017a376616 Update da.json 
Added FEELS and WEEK
 2019-02-11 08:59:16 +01:00
Anthony Buisset c5888cec66 Fix exdate handling when multiple values are specified (comma separated) 2019-02-10 16:30:12 +01:00
Jacob Ebey 3d5ad29eac - Removed trailing space 2019-02-09 13:51:23 -08:00
Jacob Ebey c608636b7a - Added autoTimezone property to the clock 2019-02-09 13:41:42 -08:00
Jacob Ebey 1a97107b2d - Converted indentation to tabs. 2019-02-09 12:49:47 -08:00
Jacob Ebey 5ca3fbeaea Added autoLocation option for weather modules. 2019-02-09 12:42:42 -08:00
Michael Teeuw 44896db668 Merge pull request #1554 from roramirez/replace-console-log-none 
serveronly: Replace the console.log of none for a \n new line
 2019-01-27 11:22:17 +01:00
Rodrigo Ramírez Norambuena 12efb87a23 serveronly: Replace the console.log of none for a \n new line 2019-01-26 14:42:15 -05:00
Michael Teeuw 9181be86ba Merge pull request #1553 from CriticalPoint/patch-1 
Updated README
 2019-01-25 09:56:25 +01:00
Mike 053b01e036 Updated README 
Scanned through it and corrected some spelling mistakes, nothing that affects the core purpose of the document.
 2019-01-25 07:50:24 +00:00
Michael Teeuw 86041d0968 Merge pull request #1541 from amcolash/trim_calendar_events 
Add in vertical cutting for long calendar event titles
 2019-01-23 13:38:19 +01:00
Michael Teeuw bd87f63e91 Merge pull request #1542 from vincep5/develop 
current.njk JS error and Loading string
 2019-01-23 13:37:25 +01:00
Dirk b79b49e8f3 Merge pull request #3 from MichMich/master 
updated from master
 2019-01-23 10:36:05 +01:00
Andrew McOlash a0dde39d97 Fix braces for if check 2019-01-21 00:47:53 -08:00
vincep5 2e03868021 current.njk JS error and Loading string 2019-01-17 08:54:16 -06:00
vin p 29384c2ba3 Merge pull request #2 from MichMich/develop 
Develop
 2019-01-17 08:48:16 -06:00
Andrew McOlash 320743ab8d fix spacing 2019-01-16 22:53:28 -08:00
Andrew McOlash 399e171083 Add in cutting of long vertical titles 2019-01-16 22:51:44 -08:00
Michael Teeuw 184164b677 Merge pull request #1535 from fdahms/develop 
forgot one sudo in installation script
 2019-01-15 12:48:11 +01:00
fdahms 6d9675a299 forgot one sudo 2019-01-13 20:07:20 +01:00
Michael Teeuw 91e8ce62d4 Merge pull request #1534 from PalatinCoder/patch-1 
fix: only show repeating count if the event is actually repeating
 2019-01-13 16:36:45 +01:00
Jan Syring-Lingenfelder 06e641015f docs: update changelog 2019-01-13 16:25:57 +01:00
Jan Syring-Lingenfelder 1c83059482 fix: only show repeating count if the event is actually repeating 2019-01-13 16:18:52 +01:00
Michael Teeuw 90b24d824a Merge pull request #1531 from fdahms/develop 
Fixing raspbian installation script
 2019-01-13 11:58:30 +01:00