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 |
|
sam detweiler
|
934ac886cb
|
Merge branch 'develop' into develop
|
2020-09-22 07:49:19 -05:00 |
|
sam detweiler
|
1b47c4d16f
|
add package-lock
|
2020-09-22 07:31:02 -05:00 |
|
sam detweiler
|
e8fd906aa1
|
move calendar to node-ical for ms timezones and timezones in general
|
2020-09-22 07:25:48 -05:00 |
|
Michael Teeuw
|
57b6ea1297
|
Merge pull request #2134 from bugsounet/patch-1
New ConfigMerge code purpose
|
2020-09-22 10:54:35 +02:00 |
|
bugsounet
|
102ff15a99
|
Checking formatting...
All matched files use Prettier code style!
|
2020-09-22 00:26:24 +02:00 |
|
Cédric
|
19148cfc84
|
Update loader.js
|
2020-09-22 00:04:05 +02:00 |
|
Cédric
|
97c2bab58a
|
apply ConfigMerge() if configDeepMerge: true
|
2020-09-21 23:21:43 +02:00 |
|
Cédric
|
1f473228ce
|
New purpose for configMerge()
|
2020-09-21 23:17:41 +02:00 |
|
Cédric
|
340a8e4176
|
(test react for in my repo)
|
2020-09-21 22:36:54 +02:00 |
|
Michael Teeuw
|
67201a52cc
|
Merge pull request #2016 from Travelbacon/develop
Changed "Gevoelstemperatuur" to "Voelt als". This is shorter and save…
|
2020-09-21 12:48:09 +02:00 |
|
Michael Teeuw
|
30e164fe0a
|
Fix merge conflict.
|
2020-09-21 12:21:08 +02:00 |
|
Michael Teeuw
|
cfcb20a468
|
Merge pull request #2133 from rejas/dependencies
Cleanup dependencies
|
2020-09-21 12:18:37 +02:00 |
|
Joris
|
24eac7ef41
|
For the mergne
|
2020-09-20 20:57:20 +02:00 |
|
ashishtank
|
94162f1b45
|
Merge pull request #1 from MichMich/develop
Catching up on 19th Sep 2020
|
2020-09-19 17:20:35 +02:00 |
|
rejas
|
01c19efc0c
|
Update CHANGELOG
|
2020-09-19 12:30:17 +02:00 |
|
rejas
|
e4f2a8a23b
|
Update dependencies
|
2020-09-19 12:25:11 +02:00 |
|
rejas
|
89b33d2c62
|
Move lodash to devDependencies sicne its used only in testing
|
2020-09-19 10:50:06 +02:00 |
|
rejas
|
3ced35a2f8
|
Dont generally use latest versions of dependencies
|
2020-09-19 10:49:59 +02:00 |
|
Michael Teeuw
|
fd4576b234
|
Merge pull request #2081 from bryanzzhu/bryanzzhu-weather
adds current, hourly, and daily forecasts to the Weather module (OpenWeatherMap One Call API)
|
2020-09-18 12:28:20 +02:00 |
|
Michael Teeuw
|
812ad829c9
|
Merge pull request #2125 from MichMich/dependabot/npm_and_yarn/node-fetch-2.6.1
Bump node-fetch from 2.6.0 to 2.6.1
|
2020-09-18 12:27:57 +02:00 |
|
Michael Teeuw
|
207a9ba723
|
Merge branch 'develop' into bryanzzhu-weather
|
2020-09-18 12:15:44 +02:00 |
|
Michael Teeuw
|
f9bf17d701
|
Merge pull request #2105 from rejas/tests
Cleanup clock tests
|
2020-09-18 12:12:29 +02:00 |
|
dependabot[bot]
|
43b96ccd1e
|
Bump node-fetch from 2.6.0 to 2.6.1
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-09-10 22:35:52 +00:00 |
|
rejas
|
14e8cdd9b2
|
Update Changelog
|
2020-09-02 13:42:35 +02:00 |
|
rejas
|
259068b860
|
Remove unused dependency, update eslint
|
2020-09-02 13:42:35 +02:00 |
|
rejas
|
a1a4192835
|
Fix clock test, remove now unneeded dependency
|
2020-09-02 13:42:35 +02:00 |
|
rejas
|
45f09dcc8c
|
Add test for analog clock face
|
2020-09-02 13:42:35 +02:00 |
|
Michael Teeuw
|
15c3f11f4a
|
Merge pull request #2121 from sdetweil/develop
fix full day recurring events not showing
|
2020-09-02 09:04:08 +02:00 |
|
Michael Teeuw
|
1a21027850
|
Fix Prettier issues.
|
2020-09-02 09:03:46 +02:00 |
|
Michael Teeuw
|
8427a9fc68
|
Merge pull request #2103 from rejas/issue_1985
Fix "undefined" in weather modules header.
|
2020-09-02 08:59:53 +02:00 |
|
Sam Detweiler
|
f09b89f975
|
fix , prettier not run
|
2020-09-01 15:13:42 -05:00 |
|
sam detweiler
|
7bec84f767
|
fix formatting, prettier did not run
|
2020-09-01 21:00:14 +01:00 |
|
sam detweiler
|
8f4cbcf817
|
Merge branch 'develop' of https://github.com/sdetweil/MagicMirror into develop
|
2020-09-01 14:41:09 +01:00 |
|
sam detweiler
|
c3382274a2
|
remove old master branch code
|
2020-09-01 14:40:07 +01:00 |
|
sam detweiler
|
493055f861
|
Merge branch 'develop' into develop
|
2020-09-01 08:15:24 -05:00 |
|