sam detweiler
|
480e1adfbf
|
Merge pull request #1 from MichMich/develop
synch fork
|
2020-10-13 08:51:10 -05:00 |
|
Michael Teeuw
|
8c04712784
|
Merge pull request #2162 from sdetweil/fixfetch
Fix calendar subsequent fetch timing with multiple calendar entries
|
2020-10-13 09:13:28 +02:00 |
|
Michael Teeuw
|
0c61ba8f2d
|
Merge pull request #2161 from Snille/develop
Fixes the un-hide problem with currentwether and weatherforcast modules.
|
2020-10-13 09:13:05 +02:00 |
|
Sam Detweiler
|
485f662d75
|
revert fetcher filtering results
|
2020-10-12 10:12:47 -05:00 |
|
Sam Detweiler
|
26caeec0c1
|
Merge branch 'fixfetch' of https://github.com/sdetweil/MagicMirror into fixfetch
|
2020-10-12 09:02:15 -05:00 |
|
Sam Detweiler
|
4a7cb88a3e
|
typo, remove dead code, comments, fix recurring refresh, let fetcher handle it
|
2020-10-12 09:01:50 -05:00 |
|
flopp999
|
d11696015d
|
Update forecast.njk
|
2020-10-12 09:10:51 +02:00 |
|
flopp999
|
3b76ca4f9b
|
Update forecast.njk
|
2020-10-12 09:09:42 +02:00 |
|
sam detweiler
|
6f3239d514
|
Merge branch 'develop' into fixfetch
|
2020-10-11 22:46:31 -05:00 |
|
Sam Detweiler
|
e8f60d39de
|
fix subsequent calendar fetcher timing
|
2020-10-11 22:43:11 -05:00 |
|
Sam Detweiler
|
a3bad8aec4
|
fix subsequent calendar fetcher timing
|
2020-10-11 22:39:42 -05:00 |
|
Erik Pettersson
|
644aa26b75
|
Update CHANGELOG.md
Added the "currentwather" and "watherforcast" update show fixes information.
|
2020-10-11 21:41:59 +02:00 |
|
Erik Pettersson
|
ecd9828afc
|
Makes the module stay hidden without a lock.
When this module is hidden from another module, it un-hides itself when it updates itself. With this change it stays hidden, as it should. :)
|
2020-10-11 21:37:00 +02:00 |
|
Erik Pettersson
|
7462d61e16
|
Makes the module stay hidden without a lock.
When this module is hidden from another module, it un-hides itself when it updates itself. With this change it stays hidden, as it should. :)
|
2020-10-11 21:35:42 +02:00 |
|
Ashish Tank
|
b95ef7250d
|
Merge branch 'develop' of https://github.com/ashishtank/MagicMirror into develop
|
2020-10-11 15:43:03 +02:00 |
|
flopp999
|
569dec1b0b
|
Update CHANGELOG.md
|
2020-10-11 09:42:09 +02:00 |
|
flopp999
|
1bc0270d7b
|
Update forecast.njk
change name of day to today and tomorrow
|
2020-10-11 09:36:52 +02:00 |
|
ashishtank
|
ebfeebc40b
|
Merge pull request #4 from MichMich/develop
Merge from Develop
|
2020-10-07 15:58:47 +02:00 |
|
Michael Teeuw
|
ec80b25087
|
Merge pull request #2150 from sdetweil/fixparse
add error handler to json parsing of translation files
|
2020-10-06 10:23:46 +02:00 |
|
Michael Teeuw
|
7a2278d7b6
|
Merge branch 'develop' into fixparse
|
2020-10-06 10:23:34 +02:00 |
|
Michael Teeuw
|
28b93b70fa
|
Merge pull request #2152 from sdetweil/new_cal
update calendar handler code for rrule and daylight/standard time adjustments
|
2020-10-06 10:19:58 +02:00 |
|
Michael Teeuw
|
0431f45190
|
Merge branch 'develop' into new_cal
|
2020-10-06 10:16:08 +02:00 |
|
Michael Teeuw
|
96ce444061
|
Merge pull request #2154 from sdetweil/fixical
fix node-ical version
|
2020-10-06 10:15:10 +02:00 |
|
sam detweiler
|
32776e7ca3
|
Merge branch 'develop' into fixparse
|
2020-10-05 13:11:55 -05:00 |
|
sam detweiler
|
35d516ad4d
|
Merge branch 'develop' into new_cal
|
2020-10-05 13:11:11 -05:00 |
|
sam detweiler
|
e6a17d27b9
|
Merge branch 'develop' into fixical
|
2020-10-05 13:10:25 -05:00 |
|
Sam Detweiler
|
52edec1b64
|
fix wrong node-ical version requested, package.json
|
2020-10-05 12:59:30 -05:00 |
|
Sam Detweiler
|
6440d2289c
|
fix translation files with comments crashing UI
|
2020-10-05 12:58:10 -05:00 |
|
Sam Detweiler
|
11afadcea8
|
fix RRULE bad date and add Windows Timezone name support
|
2020-10-05 12:56:25 -05:00 |
|
Sam Detweiler
|
2e981987f2
|
resolve conflict
|
2020-10-05 11:06:21 -05:00 |
|
Sam Detweiler
|
69efca0bdb
|
use Log.error instead of console.log for error message, shows in output
|
2020-10-05 10:45:07 -05:00 |
|
Sam Detweiler
|
eefb92367e
|
fix node-ical version
|
2020-10-05 10:02:29 -05:00 |
|
Sam Detweiler
|
8fa96c2836
|
add error handler to json parsing of translation files
|
2020-10-04 12:13:08 -05:00 |
|
Sam Detweiler
|
04dae52a6c
|
correct daylight/standard adjustments, windows timezones and east of london rrule bug
|
2020-10-04 12:10:19 -05:00 |
|
Ashish Tank
|
37c9da1351
|
Merge branch 'develop' of https://github.com/ashishtank/MagicMirror into develop
|
2020-10-02 22:01:50 +02:00 |
|
ashishtank
|
86d7ec6270
|
Merge pull request #3 from MichMich/develop
Sync with Develop
|
2020-10-02 18:06:24 +02:00 |
|
Ashish Tank
|
82f1e0fe32
|
Added Hindi and Gujarati languages
|
2020-10-02 17:51:41 +02:00 |
|
Michael Teeuw
|
6ec0aa8894
|
Prepare 2.14.0-develop
|
2020-10-01 12:19:57 +02:00 |
|
Michael Teeuw
|
3dbe8bfbbf
|
Merge pull request #2143 from MichMich/develop
Release 2.13.0
v2.13.0
|
2020-10-01 12:13:38 +02:00 |
|
Michael Teeuw
|
20d82bab78
|
Prepare 2.13.0
|
2020-10-01 11:55:18 +02:00 |
|
Michael Teeuw
|
60f6123b64
|
Merge pull request #2139 from sdetweil/develop
restore ical for 3rd party modules
|
2020-09-29 17:45:49 +02:00 |
|
Sam Detweiler
|
74887a58f6
|
remove regression on event duration
|
2020-09-29 10:33:51 -05:00 |
|
Sam Detweiler
|
76821d16fc
|
restore ical for 3rd party modules
|
2020-09-24 10:13:25 -05:00 |
|
Michael Teeuw
|
233a6b5e90
|
Merge pull request #2137 from rejas/md
Update Changelog and Licsense file
|
2020-09-22 16:16:22 +02:00 |
|
Michael Teeuw
|
a1d9337c81
|
Merge pull request #2136 from sdetweil/develop
fix package.json
|
2020-09-22 16:16:08 +02:00 |
|
rejas
|
e3fec6c3e4
|
Update Changelog and License
|
2020-09-22 15:47:16 +02:00 |
|
Sam Detweiler
|
5de88b4cc1
|
remove added lodash
|
2020-09-22 08:40:40 -05:00 |
|
Sam Detweiler
|
af5e6655e0
|
fix pull
|
2020-09-22 08:38:15 -05:00 |
|
Sam Detweiler
|
a8716799c9
|
fix dependency versioning error
|
2020-09-22 08:33:21 -05:00 |
|
Michael Teeuw
|
1672027091
|
Merge pull request #2135 from sdetweil/develop
update to node-ical, handle MS timezones and timezones in general in cal entries
|
2020-09-22 14:55:27 +02:00 |
|