Commit Graph

3521 Commits

Author SHA1 Message Date
Michael Teeuw 1c9c33b87b Merge branch 'develop' into ci-test 2020-12-21 09:16:52 +01:00
Michael Teeuw f485462af1 Merge pull request #2364 from khassel/ci-test
test github actions
2020-12-21 08:25:40 +01:00
Karsten Hassel 39d7ceb017 test github actions 2020-12-20 22:49:41 +01:00
Michael Teeuw 8251792a0d Update .prettierignore 2020-12-20 20:04:06 +01:00
Michael Teeuw 54ac450f92 Update and rename node.js.yml to node-ci.js.yml 2020-12-20 20:00:54 +01:00
Michael Teeuw 299e4a497f Create node.js.yml 2020-12-20 19:58:06 +01:00
Michael Teeuw 3024319027 Merge pull request #2222 from khassel/update_dependencies
update depencencies
2020-12-08 16:36:06 +01:00
Michael Teeuw 21ba652413 Regenerate Package.lock 2020-12-08 16:33:57 +01:00
Michael Teeuw e4b8cd92f2 Merge branch 'develop' into update_dependencies 2020-12-08 16:31:47 +01:00
Michael Teeuw 1a4a9f6501 Merge pull request #2190 from Sub028/develop
Fix windspeed convertion error in ukmetoffice weather provider
2020-12-08 16:28:02 +01:00
Michael Teeuw e950cdaf32 Prettier fixes. 2020-12-08 16:20:48 +01:00
Michael Teeuw f97be2f8f3 Fix prettier issue. 2020-12-08 16:07:11 +01:00
Michael Teeuw be0c8f4f16 Prettier fix. 2020-12-08 16:01:19 +01:00
Michael Teeuw 46fd2de315 Merge branch 'develop' into develop 2020-12-08 15:53:21 +01:00
Michael Teeuw 72f0d77865 Merge pull request #2217 from sdetweil/cal-again2
Cal again2
2020-12-08 15:51:56 +01:00
Michael Teeuw d43679d59e Merge pull request #2185 from Sub028/master
Weather config enhancement
2020-12-08 15:51:41 +01:00
Michael Teeuw ce46fb5384 Fix Prettier Issue 2020-12-08 15:43:41 +01:00
Michael Teeuw 43b33cb6de Fix prettier issue. 2020-12-08 15:42:01 +01:00
Michael Teeuw 0344399253 Fix prettier issue. 2020-12-08 15:40:46 +01:00
Michael Teeuw 3a9b154cb2 Fix code style issue. 2020-12-08 15:38:07 +01:00
Michael Teeuw 1074fbacfe Merge pull request #2215 from Alvinger/limitDays
New option "limitDays" - limit the number of discrete days to be displayed
2020-12-08 15:24:04 +01:00
Michael Teeuw 00ff3ab380 Merge branch 'develop' into limitDays 2020-12-08 15:23:54 +01:00
Michael Teeuw db874a011c Merge pull request #2214 from Alvinger/customEvents
Custom events - Use custom symbol/color based on keyword in title
2020-12-08 15:21:39 +01:00
Michael Teeuw 35a2839a2f Merge branch 'develop' into customEvents 2020-12-08 15:21:29 +01:00
Michael Teeuw cdb9b9bb87 Merge branch 'develop' into cal-again2 2020-12-08 15:17:45 +01:00
Michael Teeuw 87a3e4d440 Merge branch 'develop' into limitDays 2020-12-08 15:16:21 +01:00
Michael Teeuw 284bed677e Merge pull request #2209 from jakobsarwary1/patch-1
Create ps.json
2020-12-08 15:13:59 +01:00
Michael Teeuw 667be460e5 Merge pull request #2210 from rejas/issue-2022_catch-ical-parsing-errors
Catch errors when parsing calendar data with ical
2020-12-08 15:13:42 +01:00
Michael Teeuw c49386bb58 Merge branch 'develop' into issue-2022_catch-ical-parsing-errors 2020-12-08 15:13:34 +01:00
Michael Teeuw adb50a9623 Merge pull request #2208 from rejas/issue-2199_console-debug
Add timestamp to Log.debug
2020-12-08 15:12:39 +01:00
Michael Teeuw ac1d2372f4 Merge branch 'develop' into issue-2199_console-debug 2020-12-08 15:12:32 +01:00
Michael Teeuw f54690c829 Merge pull request #2206 from Alvinger/calendar-enhance
Calendar fixes and updates
2020-12-08 15:11:32 +01:00
Michael Teeuw 053f9c34aa Merge pull request #2205 from marvai-vgtu/patch-1
Update lt.json
2020-12-08 15:11:03 +01:00
Michael Teeuw e7dd2b4aee Merge pull request #2187 from AndyPoms/weatherbit
Add support for Weatherbit in the Weather Module
2020-12-08 15:10:45 +01:00
sam detweiler 6f82f9e01b update changelog 2020-12-07 07:27:40 -06:00
Karsten Hassel 00bdf6aaa6 update depencencies 2020-12-04 22:42:56 +01:00
Johan Alvinger 97f3514677 Bugfix after Travis CI error (redeclaring variables) 2020-11-30 16:48:07 +01:00
sam detweiler 137facf95a Merge branch 'develop' into cal-again2 2020-11-28 19:23:15 -06:00
Sam Detweiler 8afba3a5c4 fix between.from to use now, instead of yesterday for non-full day events, unless includePastEvents:true 2020-11-28 19:19:52 -06:00
Sam Detweiler 9c5383dc37 fix between.from to use now, instead of yesterday for non-full day events, unless includePastEvents:true 2020-11-28 19:13:56 -06:00
Johan Alvinger 260bc9664e Fixed variable redeclaration 2020-11-28 14:05:35 +01:00
Johan Alvinger 655ca83356 New option "limitDays" - limit the number of discreet days to be displayed 2020-11-28 14:00:38 +01:00
Johan Alvinger 472bf1665c New option "limitDays" - limit the number of discreet days to be displayed 2020-11-28 13:59:13 +01:00
Johan Alvinger db129cc19b Added "customEvents" to changelog 2020-11-28 13:19:04 +01:00
Johan Alvinger b735f8a524 New option "customEvents"
Use custom symbol and/or color based on keyword in event titles
2020-11-28 13:17:14 +01:00
Johan Alvinger 1e34764588 coloredEvents should also color the symbol if that is displayed 2020-11-26 17:14:59 +01:00
Johan Alvinger 99aaae491c Reverted changes to test case for calendar 2020-11-25 23:35:01 +01:00
Johan Alvinger f288581c69 Reverted changes to test case for calendar 2020-11-25 23:31:26 +01:00
Johan Alvinger 3c5d50bce9 Include all past events (if broadcastPastEvents set) and up to maximumEntries of current or upcoming events 2020-11-25 23:29:10 +01:00
Johan Alvinger a01f08391b Removed test on maximumEntries 2020-11-25 22:45:38 +01:00