kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2026-07-12 08:37:07 -07:00
Code Issues Projects Releases Wiki Activity
5,406 Commits 3 Branches 55 Tags
develop
Commit Graph

5406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josef Spitzlberger 41e5c2939f added config option nextDaysRelative 
added configuration option nextDaysRelative to always display today's and tomorrow's appointments in relative mode, even if timeformat is set to absolute
 2019-05-07 20:35:28 +02:00
Josef Spitzlberger 7e2ab51298 added Config Option nextDaysRelative 
added configuration option nextDaysRelative to always display today's and tomorrow's appointments in relative mode, even if timeformat is set to absolute
 2019-05-07 20:34:35 +02:00
Michael Teeuw 03f917fd9c Update changelog. 2019-05-07 20:31:41 +02:00
Josef Spitzlberger d24e10a728 added config option nextDaysRelative 
added configuration option nextDaysRelative to always display today's and tomorrow's appointments in relative mode, even if timeformat is set to absolute
 2019-05-07 20:18:32 +02:00
Josef Spitzlberger a17ac1c16e added Config Option nextDaysRelative 
added configuration option nextDaysRelative to always display today's and tomorrow's appointments in relative mode, even if timeformat is set to absolute
 2019-05-07 20:18:08 +02:00
Michael Teeuw dd6b972be4 Merge pull request #1628 from kolbyjack/feature/calendar-past-events 
Add includePastEvents global and calendar-specific settings
 2019-05-07 20:12:37 +02:00
Michael Teeuw 7d0c9ba0d9 Merge pull request #1666 from kevbodavidson/patch-1 
Update config.js.sample
 2019-05-07 20:07:32 +02:00
Michael Teeuw 6fa211634f Merge branch 'develop' into patch-1 2019-05-07 20:07:17 +02:00
Michael Teeuw 1ca24c7f38 Merge branch 'patch-1' of https://github.com/kevbodavidson/magicmirror into pr/kevbodavidson/1666 2019-05-07 20:06:06 +02:00
Michael Teeuw bcfbccae59 Update changelog. 2019-05-07 20:06:03 +02:00
kevbodavidson 20b75ce6ed Update config.js.sample 2019-05-07 20:04:55 +02:00
Michael Teeuw 2ea15d7bf5 Merge pull request #1660 from magic21nrw/master 
Update ical.js #1631
 2019-05-07 19:53:04 +02:00
Michael Teeuw 18e14c597f Merge branch 'master' of https://github.com/magic21nrw/magicmirror-1 into pr/magic21nrw/1660 2019-05-07 19:46:26 +02:00
Michael Teeuw 06d75999d7 Update changelog. 2019-05-07 19:46:23 +02:00
magic21nrw 7047a7cae6 Update ical.js 
Fixed Bug with more than one calendar.
 2019-05-07 19:45:28 +02:00
Michael Teeuw 20d2124867 Merge pull request #1661 from vincep5/develop 
Update Feels to Feels like
 2019-05-07 19:41:01 +02:00
kevbodavidson 3c7a85361e Update config.js.sample 2019-04-24 17:19:47 -04:00
vincep5 1ffbbdac99 Update English Feels to Feels like 2019-04-17 21:16:36 -05:00
vin p eeccca8842 Merge pull request #5 from MichMich/develop 
Develop
 2019-04-17 21:08:04 -05:00
magic21nrw e2d2dbd2ba Update ical.js 
Fixed Bug with more than one calendar.
 2019-04-17 20:05:33 +02:00
Jon Kolb c61f0409fb Rename includePastEvents calendar config option to broadcastPastEvents 2019-04-17 08:16:04 -04:00
Jon Kolb 806be39a6d Add includePastEvents global and calendar-specific settings 2019-04-17 08:13:51 -04:00
Michael Teeuw 6170b0d059 Merge pull request #1653 from darkniki/patch-2 
Update CHANGELOG.md
 2019-04-17 13:51:49 +02:00
Michael Teeuw bca838495e Merge pull request #1652 from michaelarnauts/1651-calendar-fix 
Fix sliceMultiDayEvents so it respects maximumNumberOfDays
 2019-04-17 13:51:07 +02:00
Michael Teeuw e31a747250 Merge pull request #1636 from darkniki/patch-1 
Update ru.json
 2019-04-17 13:49:46 +02:00
Michael Teeuw 4cf430e146 Merge pull request #1646 from michaelarnauts/patch-3 
sliceMultiDayEvents is false by default
 2019-04-17 12:17:44 +02:00
darkniki ef554cf6ec Update CHANGELOG.md 2019-04-11 14:46:32 +03:00
Thierry Nischelwitzer fcd91daee6 Merge remote-tracking branch 'upstream/master' 
Update MagicMirror
 2019-04-10 18:07:55 +02:00
Michaël Arnauts 396c78b46a Changelog 2019-04-10 10:35:11 +02:00
Michaël Arnauts 4677a3fd89 Fix many issues with sliceMultiDayEvents 2019-04-10 10:31:55 +02:00
Michael Teeuw 834ab5c6b9 Merge pull request #1642 from michaelarnauts/patch-2 
Handle SIGTERM messages
 2019-04-09 09:53:16 +02:00
Michael Teeuw 1599e8f7ff Merge pull request #1647 from retroflex/develop 
Added option to show location of calendar events
 2019-04-09 09:52:39 +02:00
Michael Teeuw 7430704002 Merge pull request #1635 from ZakarFin/translations 
Add translations for FI week/feels
 2019-04-09 09:50:31 +02:00
retroflex 4d7b19c8cb Added calendar event location 2019-04-08 21:57:32 +02:00
retroflex 40f535cf3c Added possibility to show event location. 2019-04-08 21:49:19 +02:00
Michaël Arnauts 17425dcaf7 Add CHANGELOG entry. Fix test. 2019-04-07 16:41:05 +02:00
Michaël Arnauts 6b87fc64af sliceMultiDayEvents is false by default 2019-04-07 15:26:25 +02:00
Thierry Nischelwitzer 35174b0348 bugfixing calendar module 2019-04-07 11:15:16 +02:00
Michaël Arnauts fd53541719 Handle SIGTERM messages 2019-04-06 20:50:54 +02:00
Malcolm Oakes 7c68bff9f5 Update from develop branch 2019-04-03 16:24:42 +01:00
Malcolm Oakes 6c64991951 Update from develop branch 2019-04-03 16:23:55 +01:00
Malcolm Oakes ca04ff0f37 Update from develop branch 2019-04-03 16:22:26 +01:00
Malcolm Oakes 7742575cab Merge latest from develop branch 2019-04-03 16:16:59 +01:00
Malcolm Oakes cdcdce702d Changes for UK Met Office weather data provider 2019-04-03 15:46:45 +01:00
Malcolm Oakes c80e04fe8d Add new weather data provider UK Met Office (Datapoint) 2019-04-03 15:19:32 +01:00
darkniki c3b3ea107a Update ru.json 
Added "FEELS" translation
 2019-04-03 08:31:40 +03:00
Sami Mäkinen 1dc530c549 Add translations for FI week/feels 2019-04-02 22:59:34 +03:00
Michael Teeuw 8b0b70e757 Prepare 2.8.0-develop. 2019-04-02 09:55:20 +02:00
Michael Teeuw b508a629e8 Merge pull request #1632 from MichMich/fix-2.7.1 
Fix package.json version number.
v2.7.1 		2019-04-02 09:50:36 +02:00
Michael Teeuw abb0dadead Fix package.json version number. 2019-04-02 09:34:42 +02:00