Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated ical library to latest version #2048

Merged
merged 12 commits into from
Jun 22, 2020
Merged

Updated ical library to latest version #2048

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6d60baa
Install latest ical version and use it
rejas Jun 17, 2020
7ab74c6
Remove old ical version
rejas Jun 17, 2020
442f270
Update CHANGELOG
rejas Jun 17, 2020
bb9ad3d
Use some const/let instead of var
rejas Jun 17, 2020
7d521ed
More var -> let/const conversions
rejas Jun 18, 2020
5d4a575
Undo switch to fetch, use request like ical did
rejas Jun 20, 2020
b2f71a2
Update dependencies
rejas Jun 20, 2020
53363b0
Simplify return call to make a better diff
rejas Jun 20, 2020
7e5bfa8
Fix slice parameter type
rejas Jun 20, 2020
1e5bd98
Make calendar debuger use const stuff and add npm script for it
rejas Jun 20, 2020
daa6f50
Use object.entries to iterate over data
rejas Jun 20, 2020
9831f81
Merge branch 'develop' into issue_1926
rejas Jun 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'develop' into issue_1926
  • Loading branch information
@rejas
rejas committed Jun 20, 2020
commit 9831f81b6e76e83f6f744b0bba5e3cd3052c5727
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ _This release is scheduled to be released on 2020-07-01._
- Support multiple instances of calendar module with different config [#1109](/~https://github.com/MichMich/MagicMirror/issues/1109)
- Fix the use of "maxNumberOfDays" in the module "weatherforecast" [#2018](/~https://github.com/MichMich/MagicMirror/issues/2018)
- Throw error when check_config fails [#1928](/~https://github.com/MichMich/MagicMirror/issues/1928)
- Bug fix related to 'maxEntries' not displaying Calendar events. [#2050](/~https://github.com/MichMich/MagicMirror/issues/2050)
- Updated ical library to latest version [#1926](/~https://github.com/MichMich/MagicMirror/issues/1926)

## [2.11.0] - 2020-04-01
Expand Down
2 changes: 1 addition & 1 deletion modules/default/calendar/calendarfetcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const ical = require("ical");
const moment = require("moment");
const request = require("request");

const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, includePastEvents) {
const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumNumberOfDays, auth, includePastEvents) {
const self = this;

let reloadTimer = null;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.