Commit Graph

  • da302fce32 Merge pull request #2158 from flopp999/patch-2 Michael Teeuw 2020-10-20 09:34:16 +02:00
  • e09fec56e2 Update weather_spec.js flopp999 2020-10-20 07:26:39 +02:00
  • 568f952573 Merge pull request #3 from MichMich/develop sam detweiler 2020-10-16 14:47:40 -05:00
  • fc1e488391 Merge pull request #2169 from bluemanos/patch-1 Michael Teeuw 2020-10-16 13:21:43 +02:00
  • 5781c258e0 A space after icon of sunrise and sunset Szymon Bluma 2020-10-16 12:19:48 +02:00
  • 13c542aeda Merge pull request #2167 from MichMich/fix-greek-translation Michael Teeuw 2020-10-15 09:39:50 +02:00
  • 02148f68e5 Rename greek translation. (#2155) Michael Teeuw 2020-10-15 09:26:56 +02:00
  • 3c84002abd Fix linter issues. Michael Teeuw 2020-10-15 09:20:44 +02:00
  • 01aa57e493 Merge pull request #2 from MichMich/develop sam detweiler 2020-10-13 10:13:47 -05:00
  • af09b4214a Merge pull request #2165 from MichMich/revert-2161-develop Michael Teeuw 2020-10-13 16:15:16 +02:00
  • 43b6c71205 Revert "Fixes the un-hide problem with currentwether and weatherforcast modules." Michael Teeuw 2020-10-13 16:14:52 +02:00
  • 480e1adfbf Merge pull request #1 from MichMich/develop sam detweiler 2020-10-13 08:51:10 -05:00
  • 8c04712784 Merge pull request #2162 from sdetweil/fixfetch Michael Teeuw 2020-10-13 09:13:28 +02:00
  • 0c61ba8f2d Merge pull request #2161 from Snille/develop Michael Teeuw 2020-10-13 09:13:05 +02:00
  • 485f662d75 revert fetcher filtering results Sam Detweiler 2020-10-12 10:12:47 -05:00
  • 26caeec0c1 Merge branch 'fixfetch' of https://github.com/sdetweil/MagicMirror into fixfetch Sam Detweiler 2020-10-12 09:02:15 -05:00
  • 4a7cb88a3e typo, remove dead code, comments, fix recurring refresh, let fetcher handle it Sam Detweiler 2020-10-12 09:01:50 -05:00
  • d11696015d Update forecast.njk flopp999 2020-10-12 09:10:51 +02:00
  • 3b76ca4f9b Update forecast.njk flopp999 2020-10-12 09:09:42 +02:00
  • 6f3239d514 Merge branch 'develop' into fixfetch sam detweiler 2020-10-11 22:46:31 -05:00
  • e8f60d39de fix subsequent calendar fetcher timing Sam Detweiler 2020-10-11 22:43:11 -05:00
  • a3bad8aec4 fix subsequent calendar fetcher timing Sam Detweiler 2020-10-11 22:39:42 -05:00
  • 644aa26b75 Update CHANGELOG.md Erik Pettersson 2020-10-11 21:41:59 +02:00
  • ecd9828afc Makes the module stay hidden without a lock. Erik Pettersson 2020-10-11 21:37:00 +02:00
  • 7462d61e16 Makes the module stay hidden without a lock. Erik Pettersson 2020-10-11 21:35:42 +02:00
  • b95ef7250d Merge branch 'develop' of https://github.com/ashishtank/MagicMirror into develop Ashish Tank 2020-10-11 15:43:03 +02:00
  • 569dec1b0b Update CHANGELOG.md flopp999 2020-10-11 09:42:09 +02:00
  • 1bc0270d7b Update forecast.njk flopp999 2020-10-11 09:36:52 +02:00
  • ebfeebc40b Merge pull request #4 from MichMich/develop ashishtank 2020-10-07 15:58:47 +02:00
  • ec80b25087 Merge pull request #2150 from sdetweil/fixparse Michael Teeuw 2020-10-06 10:23:46 +02:00
  • 7a2278d7b6 Merge branch 'develop' into fixparse Michael Teeuw 2020-10-06 10:23:34 +02:00
  • 28b93b70fa Merge pull request #2152 from sdetweil/new_cal Michael Teeuw 2020-10-06 10:19:58 +02:00
  • 0431f45190 Merge branch 'develop' into new_cal Michael Teeuw 2020-10-06 10:16:08 +02:00
  • 96ce444061 Merge pull request #2154 from sdetweil/fixical Michael Teeuw 2020-10-06 10:15:10 +02:00
  • 32776e7ca3 Merge branch 'develop' into fixparse sam detweiler 2020-10-05 13:11:55 -05:00
  • 35d516ad4d Merge branch 'develop' into new_cal sam detweiler 2020-10-05 13:11:11 -05:00
  • e6a17d27b9 Merge branch 'develop' into fixical sam detweiler 2020-10-05 13:10:25 -05:00
  • 52edec1b64 fix wrong node-ical version requested, package.json Sam Detweiler 2020-10-05 12:59:30 -05:00
  • 6440d2289c fix translation files with comments crashing UI Sam Detweiler 2020-10-05 12:58:10 -05:00
  • 11afadcea8 fix RRULE bad date and add Windows Timezone name support Sam Detweiler 2020-10-05 12:56:25 -05:00
  • 2e981987f2 resolve conflict Sam Detweiler 2020-10-05 11:06:21 -05:00
  • 69efca0bdb use Log.error instead of console.log for error message, shows in output Sam Detweiler 2020-10-05 10:45:07 -05:00
  • eefb92367e fix node-ical version Sam Detweiler 2020-10-05 10:02:29 -05:00
  • 8fa96c2836 add error handler to json parsing of translation files Sam Detweiler 2020-10-04 12:13:08 -05:00
  • 04dae52a6c correct daylight/standard adjustments, windows timezones and east of london rrule bug Sam Detweiler 2020-10-04 12:10:19 -05:00
  • 37c9da1351 Merge branch 'develop' of https://github.com/ashishtank/MagicMirror into develop Ashish Tank 2020-10-02 22:01:50 +02:00
  • 86d7ec6270 Merge pull request #3 from MichMich/develop ashishtank 2020-10-02 18:06:24 +02:00
  • 82f1e0fe32 Added Hindi and Gujarati languages Ashish Tank 2020-10-02 17:51:41 +02:00
  • 6ec0aa8894 Prepare 2.14.0-develop Michael Teeuw 2020-10-01 12:19:57 +02:00
  • 3dbe8bfbbf Merge pull request #2143 from MichMich/develop v2.13.0 Michael Teeuw 2020-10-01 12:13:38 +02:00
  • 20d82bab78 Prepare 2.13.0 Michael Teeuw 2020-10-01 11:55:18 +02:00
  • 60f6123b64 Merge pull request #2139 from sdetweil/develop Michael Teeuw 2020-09-29 17:45:49 +02:00
  • 74887a58f6 remove regression on event duration Sam Detweiler 2020-09-29 10:33:51 -05:00
  • 76821d16fc restore ical for 3rd party modules Sam Detweiler 2020-09-24 10:13:25 -05:00
  • 233a6b5e90 Merge pull request #2137 from rejas/md Michael Teeuw 2020-09-22 16:16:22 +02:00
  • a1d9337c81 Merge pull request #2136 from sdetweil/develop Michael Teeuw 2020-09-22 16:16:08 +02:00
  • e3fec6c3e4 Update Changelog and License rejas 2020-09-22 15:47:16 +02:00
  • 5de88b4cc1 remove added lodash Sam Detweiler 2020-09-22 08:40:40 -05:00
  • af5e6655e0 fix pull Sam Detweiler 2020-09-22 08:38:15 -05:00
  • a8716799c9 fix dependency versioning error Sam Detweiler 2020-09-22 08:33:21 -05:00
  • 1672027091 Merge pull request #2135 from sdetweil/develop Michael Teeuw 2020-09-22 14:55:27 +02:00
  • 934ac886cb Merge branch 'develop' into develop sam detweiler 2020-09-22 07:49:19 -05:00
  • 1b47c4d16f add package-lock sam detweiler 2020-09-22 07:31:02 -05:00
  • e8fd906aa1 move calendar to node-ical for ms timezones and timezones in general sam detweiler 2020-09-22 07:25:48 -05:00
  • 57b6ea1297 Merge pull request #2134 from bugsounet/patch-1 Michael Teeuw 2020-09-22 10:54:35 +02:00
  • 102ff15a99 Checking formatting... bugsounet 2020-09-22 00:26:24 +02:00
  • 19148cfc84 Update loader.js Cédric 2020-09-22 00:04:05 +02:00
  • 97c2bab58a apply ConfigMerge() if configDeepMerge: true Cédric 2020-09-21 23:21:43 +02:00
  • 1f473228ce New purpose for configMerge() Cédric 2020-09-21 23:17:41 +02:00
  • 340a8e4176 (test react for in my repo) Cédric 2020-09-21 22:36:54 +02:00
  • 67201a52cc Merge pull request #2016 from Travelbacon/develop Michael Teeuw 2020-09-21 12:48:09 +02:00
  • 30e164fe0a Fix merge conflict. Michael Teeuw 2020-09-21 12:21:08 +02:00
  • cfcb20a468 Merge pull request #2133 from rejas/dependencies Michael Teeuw 2020-09-21 12:18:37 +02:00
  • 24eac7ef41 For the mergne Joris 2020-09-20 20:57:20 +02:00
  • 94162f1b45 Merge pull request #1 from MichMich/develop ashishtank 2020-09-19 17:20:35 +02:00
  • 01c19efc0c Update CHANGELOG rejas 2020-09-19 12:30:17 +02:00
  • e4f2a8a23b Update dependencies rejas 2020-09-19 12:25:11 +02:00
  • 89b33d2c62 Move lodash to devDependencies sicne its used only in testing rejas 2020-07-30 13:04:55 +02:00
  • 3ced35a2f8 Dont generally use latest versions of dependencies rejas 2020-07-30 13:03:42 +02:00
  • fd4576b234 Merge pull request #2081 from bryanzzhu/bryanzzhu-weather Michael Teeuw 2020-09-18 12:28:20 +02:00
  • 812ad829c9 Merge pull request #2125 from MichMich/dependabot/npm_and_yarn/node-fetch-2.6.1 Michael Teeuw 2020-09-18 12:27:57 +02:00
  • 207a9ba723 Merge branch 'develop' into bryanzzhu-weather Michael Teeuw 2020-09-18 12:15:44 +02:00
  • f9bf17d701 Merge pull request #2105 from rejas/tests Michael Teeuw 2020-09-18 12:12:29 +02:00
  • 43b96ccd1e Bump node-fetch from 2.6.0 to 2.6.1 dependabot[bot] 2020-09-10 22:35:52 +00:00
  • 14e8cdd9b2 Update Changelog rejas 2020-08-02 15:39:10 +02:00
  • 259068b860 Remove unused dependency, update eslint rejas 2020-08-02 15:23:22 +02:00
  • a1a4192835 Fix clock test, remove now unneeded dependency rejas 2020-08-02 15:19:36 +02:00
  • 45f09dcc8c Add test for analog clock face rejas 2020-07-21 11:27:45 +02:00
  • 15c3f11f4a Merge pull request #2121 from sdetweil/develop Michael Teeuw 2020-09-02 09:04:08 +02:00
  • 1a21027850 Fix Prettier issues. Michael Teeuw 2020-09-02 09:03:46 +02:00
  • 8427a9fc68 Merge pull request #2103 from rejas/issue_1985 Michael Teeuw 2020-09-02 08:59:53 +02:00
  • f09b89f975 fix , prettier not run Sam Detweiler 2020-09-01 15:13:42 -05:00
  • 7bec84f767 fix formatting, prettier did not run sam detweiler 2020-09-01 21:00:14 +01:00
  • 8f4cbcf817 Merge branch 'develop' of https://github.com/sdetweil/MagicMirror into develop sam detweiler 2020-09-01 14:41:09 +01:00
  • c3382274a2 remove old master branch code sam detweiler 2020-09-01 14:40:07 +01:00
  • 493055f861 Merge branch 'develop' into develop sam detweiler 2020-09-01 08:15:24 -05:00
  • 11fbbd49f3 add changelog sam detweiler 2020-09-01 14:10:25 +01:00
  • 8ce37d53cd fix recurring full date events sam detweiler 2020-09-01 14:04:35 +01:00
  • baa4012872 Merge pull request #98 from MichMich/master sam detweiler 2020-08-31 19:15:08 -05:00
  • 16c5eba2be Update Changelog rejas 2020-08-01 12:42:31 +02:00