Merge latest from develop branch

This commit is contained in:
Malcolm Oakes 2019-04-03 16:16:59 +01:00
parent c80e04fe8d
commit 7742575cab
3 changed files with 20 additions and 2 deletions

View File

@ -7,6 +7,24 @@ This project adheres to [Semantic Versioning](http://semver.org/).
❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² core. ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² core.
## [2.8.0] - Unreleased
*This release is scheduled to be released on 2019-04-01.*
### Added
Added UK Met Office Datapoint feed as a provider in the default weather module.
- added new provider class
- added suncalc.js dependency to calculate sun times (not provided in datapoint feed)
- added "ukunits": temp in degrees C, wind speed in MPH, precipitation in %
- use Feels Like temp from feed if present
- optionally display precipitation in current weather
### Updated
### Fixed
## [2.7.1] - 2019-04-02 ## [2.7.1] - 2019-04-02
Fixed `package.json` version number. Fixed `package.json` version number.

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "magicmirror", "name": "magicmirror",
"version": "2.7.1", "version": "2.8.0-develop",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "magicmirror", "name": "magicmirror",
"version": "2.7.1", "version": "2.8.0-develop",
"description": "The open source modular smart mirror platform.", "description": "The open source modular smart mirror platform.",
"main": "js/electron.js", "main": "js/electron.js",
"scripts": { "scripts": {