Merge branch 'develop' into log-consistency

This commit is contained in:
Michael Teeuw 2021-04-08 10:37:18 +02:00 committed by GitHub
commit 0151466a28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 11 deletions

View File

@ -5,12 +5,21 @@ This project adheres to [Semantic Versioning](https://semver.org/).
❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror²
## [2.16.0] -
## [2.16.0] - Unreleased (Develop Branch)
_This release is scheduled to be released on 2021-04-01._
### Added
### Updated
- Bump node-ical to v0.13.0 (now last runtime dependency using deprecated `request` package is removed).
### Removed
### Fixed
- Fix calendar start function logging inconsistency
- Fix updatenotification start function logging inconsistency
- Fix calendar start function logging inconsistency.
- Fix updatenotification start function logging inconsistency.
## [2.15.0] - 2021-04-01

10
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "magicmirror",
"version": "2.15.0",
"version": "2.16.0-develop",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -4375,12 +4375,12 @@
"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
},
"node-ical": {
"version": "0.12.9",
"resolved": "https://registry.npmjs.org/node-ical/-/node-ical-0.12.9.tgz",
"integrity": "sha512-5nUEZfZPpBpeZbmYCCmNRLsoP08+SGZy/fKxNBX9k67JMUTMFPLEyZ0CXApPDIExX0izMRndG1PsymhEkkSL2Q==",
"version": "0.13.0",
"resolved": "https://registry.npmjs.org/node-ical/-/node-ical-0.13.0.tgz",
"integrity": "sha512-hfV7HsY0oTehirXLtkKgAdVomSv6/zjSw66z/RTkKfEp9MwwIz1asyE/g9x4ZKWE2YqGnr81Se5zSRcligPY5Q==",
"requires": {
"moment-timezone": "^0.5.31",
"request": "^2.88.2",
"node-fetch": "^2.6.1",
"rrule": "2.6.8",
"uuid": "^8.3.1"
}

View File

@ -1,6 +1,6 @@
{
"name": "magicmirror",
"version": "2.15.0",
"version": "2.16.0-develop",
"description": "The open source modular smart mirror platform.",
"main": "js/electron.js",
"scripts": {
@ -81,7 +81,7 @@
"module-alias": "^2.2.2",
"moment": "^2.29.1",
"node-fetch": "^2.6.1",
"node-ical": "^0.12.9",
"node-ical": "^0.13.0",
"rrule": "^2.6.8",
"rrule-alt": "^2.2.8",
"simple-git": "^2.37.0",