Commit Graph

  • 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
  • ec08cb32aa Set visibility of header more explicitly rejas 2020-08-01 12:31:48 +02:00
  • 86fb1b938b Check for undefined header data in weather modules rejas 2020-08-01 12:30:59 +02:00
  • 5aa7097a6e Add test for displaying the header rejas 2020-08-01 12:20:16 +02:00
  • fd3f520e95 Fix typos rejas 2020-08-01 10:43:58 +02:00
  • 49ff92892f Warn user if he uses the sample value in the config for the apiid rejas 2020-08-01 08:52:49 +02:00
  • 904f5a2656 Merge pull request #2112 from rejas/issue_2109 Michael Teeuw 2020-08-13 21:44:08 +02:00
  • bb105dd832 Merge pull request #2101 from rejas/jsdoc Michael Teeuw 2020-08-13 21:43:27 +02:00
  • fd934c0514 Merge pull request #2100 from Bee-Mar/develop Michael Teeuw 2020-08-13 21:42:38 +02:00
  • 66609428a2 Remove thrown Errors and add some color to the ouput rejas 2020-08-08 22:16:27 +02:00
  • 0056e0bc6d Update CHANGELOG rejas 2020-08-07 09:58:55 +02:00
  • 056b66a764 Dont use the prettier based config for verifying the syntax rejas 2020-08-07 09:57:06 +02:00
  • 3438a5a374 Cleanup newsfeed jsdoc rejas 2020-08-03 11:36:29 +02:00
  • 9f3806dabf Update eslint jsdoc plugin rejas 2020-08-03 11:20:11 +02:00
  • 1d4d5cc4e7 Cleanup calendar jsdoc rejas 2020-08-03 11:19:54 +02:00
  • 3901543697 readded processing for numEntries option that I accidentally took out Bryan Zhu 2020-08-02 00:22:19 -04:00
  • a4d73e2a67 amended code according to pull request reviews Bryan Zhu 2020-08-01 17:39:58 -04:00
  • f6854f58ff ran prettier on weather module code Bryan Zhu 2020-08-01 14:03:48 -04:00
  • ad7f7d2890 Merge branch 'bryanzzhu-weather' of https://github.com/bryanzzhu/MagicMirror into bryanzzhu-weather Bryan Zhu 2020-08-01 13:33:21 -04:00
  • 498db63cac Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop Bryan Zhu 2020-08-01 13:32:29 -04:00
  • 05659820d0 Minor cleanups rejas 2020-08-01 17:06:56 +02:00
  • 02779ef725 Cleanup main jsdoc rejas 2020-08-01 17:06:46 +02:00
  • 935c9b6a42 Cleanup loader jsdoc rejas 2020-08-01 16:38:32 +02:00
  • 522f7644a3 Add typedef for Module, use it in other jsdocs rejas 2020-08-01 16:31:42 +02:00
  • b1a67d1fc5 integrated onecall usage into existing types Bryan Zhu 2020-08-01 02:59:08 -04:00
  • 0674c0aff6 Updated changelog rejas 2020-07-30 13:00:02 +02:00
  • c8664d5952 Cleanup weatherprovider jsdoc rejas 2020-07-30 12:58:35 +02:00
  • 8ce1e2c956 Cleanup calendar jsdoc rejas 2020-07-30 12:54:39 +02:00
  • 90cca28e01 Cleanup clock jsdoc rejas 2020-07-30 09:36:01 +02:00
  • e489b7101c Cleanup notificationFx jsdoc rejas 2020-07-30 09:33:19 +02:00
  • eee64c8064 Cleanup clientonly jsdoc rejas 2020-07-29 22:13:19 +02:00
  • a0d4e8dafc updated changelog Brandon Marlowe 2020-07-28 23:55:39 -04:00
  • e6b94df06d Merge branch 'mmpm-integration' of github.com:Bee-Mar/MagicMirror into develop Brandon Marlowe 2020-07-28 23:53:03 -04:00
  • 6f1c7d6253 added --dry-run option to prevent updatenotification module from consuming fetch result Brandon Marlowe 2020-07-28 23:51:38 -04:00
  • 2d5a19b676 Cleanup module jsdoc rejas 2020-07-28 16:48:03 +02:00
  • d1e8dded68 Cleanup class jsdoc rejas 2020-07-27 21:39:25 +02:00
  • 9888f66c84 Cleanup check_config jsdoc rejas 2020-07-27 20:14:10 +02:00
  • 5ec51d0ccc Cleanup app jsdoc rejas 2020-07-27 20:10:31 +02:00
  • 79f9331073 Cleanup translator jsdoc rejas 2020-07-27 14:26:01 +02:00
  • 43bcf4ab98 Run eslint over files, see what gets fixed automatically and clean up rejas 2020-07-27 14:24:30 +02:00
  • f4eae72c48 Install eslint jsdoc plugin rejas 2020-07-27 13:10:07 +02:00
  • 9d14d3e5b7 Merge pull request #2095 from rejas/issue_2072_take_2 Michael Teeuw 2020-07-20 19:27:55 +02:00
  • 26d3141489 Fix face-006 too rejas 2020-07-20 19:13:12 +02:00
  • 5c44f51d6d Merge pull request #2079 from rejas/issue_2023 Michael Teeuw 2020-07-19 20:41:22 +02:00
  • 50f3f32ba8 Add tests for custom icons rejas 2020-07-19 11:54:03 +02:00