kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 12:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into new_cal

Browse Source
This commit is contained in:
Michael Teeuw 2020-10-06 10:16:08 +02:00 committed by GitHub
commit 0431f45190
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -17,7 +17,8 @@ _This release is scheduled to be released on 2021-01-01._
### Fixed ### Fixed
- Calendar parsing where RRULE bug returns wrong date, add Windows timezone name support - Calendar parsing where RRULE bug returns wrong date, add Windows timezone name support.
- Wrong node-ical version installed (package.json) requested version.
## [2.13.0] - 2020-10-01 ## [2.13.0] - 2020-10-01

6
package-lock.json generated
View File

@ -5723,9 +5723,9 @@
"dev": true "dev": true
}, },
"node-ical": { "node-ical": {
"version": "0.12.0", "version": "0.12.1",
"resolved": "https://registry.npmjs.org/node-ical/-/node-ical-0.12.0.tgz", "resolved": "https://registry.npmjs.org/node-ical/-/node-ical-0.12.1.tgz",
"integrity": "sha512-whPA/GABFAWMVzqKeTuBjzPGCfNR9eoCSWPHE6MkHyDlQqScdVfyWr0dRy50Lvfz9JCNqFqiko1GpHJ21pn8YA==", "integrity": "sha512-1YlvRyfOs0fUr8KWtgj4r/4VMI0tuBLfVSyrmDk00jLuUkXouiSU0PptEGdJs3U3pibF8ZThU6rVVS/jkcXJBQ==",
"requires": { "requires": {
"moment-timezone": "^0.5.31", "moment-timezone": "^0.5.31",
"request": "^2.88.2", "request": "^2.88.2",

2
package.json
View File

@ -79,7 +79,7 @@
"iconv-lite": "^0.6.2", "iconv-lite": "^0.6.2",
"module-alias": "^2.2.2", "module-alias": "^2.2.2",
"moment": "^2.28.0", "moment": "^2.28.0",
"node-ical": "^0.12.0", "node-ical": "^0.12.1",
"request": "^2.88.2", "request": "^2.88.2",
"rrule": "^2.6.6", "rrule": "^2.6.6",
"rrule-alt": "^2.2.8", "rrule-alt": "^2.2.8",