Commit Graph

2619 Commits

Author SHA1 Message Date
Michael Teeuw 2b7accaf68 Merge pull request #1703 from rejas/fix_eslint_errors_automatically
Fix tests
2019-06-14 14:39:12 +02:00
Veeck 5533d93172 Update changelog 2019-06-14 14:06:36 +02:00
Veeck f0e8c865fe Fix markdown error 2019-06-14 14:03:58 +02:00
Veeck 36400c0a83 Fix some eslint errors from previous merges 2019-06-14 14:03:07 +02:00
Veeck c5383557b5 Pass fix options to eslint 2019-06-14 14:02:48 +02:00
Michael Teeuw b645007884 Updated the fetchedLocationName (See PR: #1702) 2019-06-14 13:42:59 +02:00
Michael Teeuw 63ac137206 Merge branch 'mattdb-calendar-rrule' into develop 2019-06-14 13:32:20 +02:00
Michael Teeuw 808cbf8e0b Fix Typecheck. 2019-06-14 13:32:07 +02:00
Michael Teeuw 8ed77ba0c7 Merge 2019-06-14 13:31:59 +02:00
Michael Teeuw 66c74c51e4 Merge branch 'rejas-cleanups' into develop 2019-06-14 13:19:43 +02:00
Michael Teeuw 7a272ef0ab Merge conflict. 2019-06-14 13:19:29 +02:00
Michael Teeuw 60b817ec8e Merge branch 'cybex-dev-develop' into develop 2019-06-14 13:05:36 +02:00
Michael Teeuw a41ecaf7cc Merge 2019-06-14 13:05:22 +02:00
Matt Bauer d41afa0e53 Calendar fetch error is still a loading result
Also log error on node side as well.
2019-06-13 15:52:49 -05:00
Matt Bauer a6284e05e5 Update rrule and request dependencies for calendar’s vendored ical.js
rrule-alt has not been updated in some time, while the main rrule has. ical.js is using updated rrule. Getting rid of rrule-alt would affect some third-party modules, however, so we should keep it around for now at least.
2019-06-13 14:45:32 -05:00
Matt Bauer e56f61441d Repeating event handling “robustified” 2019-06-13 13:44:54 -05:00
Matt Bauer 7b4b7dffa2 Update calendar’s vendored ical.js 2019-06-13 13:44:54 -05:00
Michael Teeuw 77a214ef9c Merge pull request #1695 from Jason-Cooke/patch-2
docs: fix typo
2019-06-13 20:16:15 +02:00
Michael Teeuw cf2723aafb Merge pull request #1699 from Hg347/calendar-1696
fixed calendar, issue 1696, ics file start date is not date type
2019-06-13 20:15:53 +02:00
Christoph Hagedorn 499e99cfc5 fixed url 2019-06-13 18:11:41 +02:00
Michael Teeuw a7b83e9fe3 Merge pull request #1637 from maloakes/master
Add Weather provider UK Met Office
2019-06-13 16:51:09 +02:00
Christoph Hagedorn 964504b9c3 curr.exdates[i] might not be a date, so toISOString() may fail too 2019-06-11 23:24:03 +02:00
Christoph Hagedorn ec65e66c58 added fixed issue in changelog 2019-06-11 22:43:48 +02:00
Christoph Hagedorn e694b080be curr.start is not always a date type (depends on ics file). A type check
has been added.
2019-06-09 17:46:48 +02:00
Malcolm Oakes 70894b3938 Corrected merge problem 2019-06-08 15:34:37 +01:00
Malcolm Oakes fb7115fc13 Merge remote-tracking branch 'upstream/develop' 2019-06-07 16:44:42 +01:00
Malcolm Oakes a619fc4fef Allow temp and wind units to be specified separately if required. 2019-06-07 15:27:08 +01:00
Jason Cooke 7c6c5fd06f docs: fix typo 2019-06-07 10:34:55 +12:00
Malcolm Oakes 2970568eab Merge branch 'master' of https://github.com/maloakes/MagicMirror
Merge latest from github
2019-06-06 10:59:47 +01:00
rejas 62cb3a610e Actually only test json files in jsonlint, rename stylelintrc for clarity 2019-06-05 20:33:53 +02:00
rejas f600c163ca Fix intendation 2019-06-05 18:30:04 +02:00
rejas 77cb68e5ac Remove unnecessary entry 2019-06-05 18:29:51 +02:00
rejas c6314576aa Fix duplicate json entry 2019-06-05 17:04:51 +02:00
rejas 515c183070 Fix a comparison that was an assignement 2019-06-05 17:01:54 +02:00
rejas 63b9c0e6b8 More dependency updates and cleanup of old ones 2019-06-05 16:54:32 +02:00
rejas 84893b1664 Upgrade markdown lint to latest 2019-06-05 10:26:20 +02:00
rejas 835668d96d Add eslint semi rule 2019-06-05 10:23:58 +02:00
rejas 2bce15dc6e Remove multiple-empty-lines 2019-06-05 10:03:28 +02:00
rejas 8f1a212b52 More typo fixes 2019-06-05 09:46:59 +02:00
rejas 5c08bde0fa More == -> === and != -> !== fixes 2019-06-05 09:32:10 +02:00
rejas 98a84c031e Better fix for translator comparison 2019-06-05 08:55:17 +02:00
rejas ea1715384e Revert "Revert "Fix some == with ===""
This reverts commit d9a4ee4f65.
2019-06-05 08:48:22 +02:00
rejas d9a4ee4f65 Revert "Fix some == with ==="
This reverts commit 5d39d85215.
2019-06-04 11:04:47 +02:00
rejas 62017c4661 Update changelog 2019-06-04 10:43:16 +02:00
rejas 702b98f510 Cleanup imports 2019-06-04 10:43:06 +02:00
rejas 69aafd7d6a Fix missing ; and == and some missing vars 2019-06-04 10:19:25 +02:00
rejas c1559dd8c8 More spelling fixes 2019-06-04 10:15:50 +02:00
rejas 4df1895560 Fix badge for travis which moved to .com from .org 2019-06-04 10:14:37 +02:00
rejas cac92da6e4 Remove unused dependency, move mocha-logger to dev 2019-06-04 10:13:58 +02:00
rejas 5d39d85215 Fix some == with === 2019-06-04 09:51:51 +02:00