Merge pull request #1343 from MichMich/develop

Release 2.4.1
Prepare for release 2.4.1
2025-10-17 01:42:18 +00:00 · 2018-07-04 11:27:05 +02:00 · 2018-07-04 11:20:37 +02:00 · 2018-07-03 17:08:07 +02:00 · 2018-07-02 23:22:09 +03:00 · 2018-07-01 21:01:41 +02:00
34 changed files with 3066 additions and 5918 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ jspm_modules
 # Visual Studio Code ignoramuses.
 .vscode/

+# IDE Code ignoramuses.
+.idea/
+
 # Various Windows ignoramuses.
 Thumbs.db
 ehthumbs.db
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,63 @@
 # MagicMirror² Change Log
+
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+---
+
+## [2.4.1] - 2018-07-04
+
+### Fixed
+
+- Fix weather parsing issue #1332.
+
+## [2.4.0] - 2018-07-01
+
+⚠️ **Warning:** This release includes an updated version of Electron. This requires a Raspberry Pi configuration change to allow the best performance and prevent the CPU from overheating. Please read the information on the [MagicMirror Wiki](https://github.com/michmich/magicmirror/wiki/configuring-the-raspberry-pi#enable-the-open-gl-driver-to-decrease-electrons-cpu-usage).
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
+
+### Added
+
+- Enabled translation of feelsLike for module currentweather
+- Added support for on-going calendar events
+- Added scroll up in fullscreen newsfeed article view
+- Changed fullscreen newsfeed width from 100% to 100vw (better results)
+- Added option to calendar module that colors only the symbol instead of the whole line
+- Added option for new display format in the calendar module with date headers with times/events below.
+- Ability to fetch compliments from a remote server
+- Add regex filtering to calendar module
+- Customize classes for table
+- Added option to newsfeed module to only log error parsing a news article if enabled
+- Add update translations for Português Brasileiro
+
+### Changed
+- Upgrade to Electron 2.0.0.
+- Remove yarn-or-npm which breaks production builds.
+- Invoke module suspend even if no dom content. [#1308](https://github.com/MichMich/MagicMirror/issues/1308)
+
+### Fixed
+- Fixed issue where wind chill could not be displayed in Fahrenheit. [#1247](https://github.com/MichMich/MagicMirror/issues/1247)
+- Fixed issues where a module crashes when it tries to dismiss a non existing alert. [#1240](https://github.com/MichMich/MagicMirror/issues/1240)
+- In default module currentWeather/currentWeather.js line 296, 300, self.config.animationSpeed can not be found because the notificationReceived function does not have "self" variable.
+- Fixed browser-side code to work on the Midori browser.
+- Fixed issue where heat index was reporting incorrect values in Celsius and Fahrenheit. [#1263](https://github.com/MichMich/MagicMirror/issues/1263)
+- Fixed weatherforecast to use dt_txt field instead of dt to handle timezones better
+- Newsfeed now remembers to show the description when `"ARTICLE_LESS_DETAILS"` is called if the user wants to always show the description. [#1282](https://github.com/MichMich/MagicMirror/issues/1282)
+- `clientonly/*.js` is now linted, and one linting error is fixed
+- Fix issue #1196 by changing underscore to hyphen in locale id, in align with momentjs.
+- Fixed issue where heat index and wind chill were reporting incorrect values in Kelvin. [#1263](https://github.com/MichMich/MagicMirror/issues/1263)
+
+### Updated
+- Updated Italian translation
+- Updated German translation
+- Updated Dutch translation
+
+## [2.3.1] - 2018-04-01
+
+### Fixed
+- Downgrade electron to 1.4.15 to solve the black screen issue.[#1243](https://github.com/MichMich/MagicMirror/issues/1243)
+
 ## [2.3.0] - 2018-04-01

 ### Added
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,6 +11,7 @@ module.exports = function(grunt) {
 				"modules/default/*.js",
 				"modules/default/*/*.js",
 				"serveronly/*.js",
+				"clientonly/*.js",
 				"*.js",
 				"tests/**/*.js",
 				"!modules/default/alert/notificationFx.js",
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ MagicMirror² focuses on a modular plugin system and uses [Electron](http://elec
 ## Table Of Contents

 - [Installation](#installation)
-  - [Raspberry Pi](#raspberrypi)
+  - [Raspberry Pi](#raspberry-pi)
  - [General](#general)
  - [Server Only](#server-only)
  - [Client Only](#client-only)
@@ -119,11 +119,11 @@ The following wiki links are helpful for the initial configuration of your Magic

 ### General

-1. Copy `config/config.js.sample` to `config/config.js`. \
+1. Copy `/home/pi/MagicMirror/config/config.js.sample` to `/home/pi/MagicMirror/config/config.js`. \
   **Note:** If you used the installer script. This step is already done for you.

 2. Modify your required settings. \
-   Note: You'll can check your configuration running `npm run config:check`.
+   Note: You'll can check your configuration running `npm run config:check` in `/home/pi/MagicMirror`.


 The following properties can be configured:
@@ -146,7 +146,7 @@ Module configuration:
 | **Option** | **Description** |
 | --- | --- |
 | `module` | The name of the module. This can also contain the subfolder. Valid examples include `clock`, `default/calendar` and `custommodules/mymodule`. |
-| `position` | The location of the module in which the module will be loaded. Possible values are `top_ bar`, `top_left`, `top_center`, `top_right`, `upper_third`, `middle_center`, `lower_third`, `bottom_left`, `bottom_center`, `bottom_right`, `bottom_bar`, `fullscreen_above`, and `fullscreen_below`. This field is optional but most modules require this field to set. Check the documentation of the module for more information. Multiple modules with the same position will be ordered based on the order in the configuration file. |
+| `position` | The location of the module in which the module will be loaded. Possible values are `top_bar`, `top_left`, `top_center`, `top_right`, `upper_third`, `middle_center`, `lower_third`, `bottom_left`, `bottom_center`, `bottom_right`, `bottom_bar`, `fullscreen_above`, and `fullscreen_below`. This field is optional but most modules require this field to set. Check the documentation of the module for more information. Multiple modules with the same position will be ordered based on the order in the configuration file. |
 | `classes` | Additional classes which are passed to the module. The field is optional. |
 | `header` | To display a header text above the module, add the header property. This field is optional. |
 | `disabled` | Set disabled to `true` to skip creating the module. This field is optional. |
--- a/clientonly/index.js
+++ b/clientonly/index.js
@@ -88,7 +88,7 @@
 					process.stdout.write(`Client: ${err}`);
 				});

-				child.on('close', (code) => {
+				child.on("close", (code) => {
 					if (code != 0) {
 						console.log(`There something wrong. The clientonly is not running code ${code}`);
 					}
--- a/fonts/yarn.lock
+++ b/fonts/yarn.lock
@@ -0,0 +1,7 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+roboto-fontface@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/roboto-fontface/-/roboto-fontface-0.8.0.tgz#031a83c8f79932801a57d83bf743f37250163499"
--- a/js/main.js
+++ b/js/main.js
@@ -21,7 +21,7 @@ var MM = (function() {
 	var createDomObjects = function() {
 		var domCreationPromises = [];

-		modules.forEach(module => {
+		modules.forEach(function(module) {
 			if (typeof module.data.position !== "string") {
 				return;
 			}
@@ -52,14 +52,14 @@ var MM = (function() {

 			var domCreationPromise = updateDom(module, 0);
 			domCreationPromises.push(domCreationPromise);
-			domCreationPromise.then(() => {
+			domCreationPromise.then(function() {
 				sendNotification("MODULE_DOM_CREATED", null, null, module);
 			}).catch(Log.error);
 		});

 		updateWrapperStates();

-		Promise.all(domCreationPromises).then(() => {
+		Promise.all(domCreationPromises).then(function() {
 			sendNotification("DOM_OBJECTS_CREATED");
 		});
 	};
@@ -106,7 +106,7 @@ var MM = (function() {
 	 * return Promise - Resolved when the dom is fully updated.
 	 */
 	var updateDom = function(module, speed) {
-		return new Promise((resolve) => {
+		return new Promise(function(resolve) {
 			var newContentPromise = module.getDom();
 			var newHeader = module.getHeader();

@@ -115,7 +115,7 @@ var MM = (function() {
 				newContentPromise = Promise.resolve(newContentPromise);
 			}

-			newContentPromise.then((newContent) => {
+			newContentPromise.then(function(newContent) {
 				var updatePromise = updateDomWithContent(module, speed, newHeader, newContent);

 				updatePromise.then(resolve).catch(Log.error);
@@ -134,7 +134,7 @@ var MM = (function() {
 	 * return Promise - Resolved when the module dom has been updated.
 	 */
 	var updateDomWithContent = function(module, speed, newHeader, newContent) {
-		return new Promise((resolve) => {
+		return new Promise(function(resolve) {
 			if (module.hidden || !speed) {
 				updateModuleContent(module, newHeader, newContent);
 				resolve();
@@ -245,6 +245,9 @@ var MM = (function() {

 				if (typeof callback === "function") { callback(); }
 			}, speed);
+		} else {
+			// invoke callback even if no content, issue 1308
+			if (typeof callback === "function") { callback(); }
 		}
 	};

--- a/js/module.js
+++ b/js/module.js
@@ -81,15 +81,16 @@ var Module = Class.extend({
 	 * return DomObject | Promise - The dom or a promise with the dom to display.
 	 */
 	getDom: function () {
-		return new Promise((resolve) => {
+		var self = this;
+		return new Promise(function(resolve) {
 			var div = document.createElement("div");
-			var template = this.getTemplate();
-			var templateData = this.getTemplateData();
+			var template = self.getTemplate();
+			var templateData = self.getTemplateData();

 			// Check to see if we need to render a template string or a file.
 			if (/^.*((\.html)|(\.njk))$/.test(template)) {
 				// the template is a filename
-				this.nunjucksEnvironment().render(template, templateData, function (err, res) {
+				self.nunjucksEnvironment().render(template, templateData, function (err, res) {
 					if (err) {
 						Log.error(err)
 					}
@@ -100,7 +101,7 @@ var Module = Class.extend({
 				});
 			} else {
 				// the template is a template string.
-				div.innerHTML = this.nunjucksEnvironment().renderString(template, templateData);
+				div.innerHTML = self.nunjucksEnvironment().renderString(template, templateData);

 				resolve(div);
 			}
--- a/modules/default/alert/alert.js
+++ b/modules/default/alert/alert.js
@@ -110,11 +110,13 @@ Module.register("alert",{
 	},
 	hide_alert: function(sender) {
 		//Dismiss alert and remove from this.alerts
-		this.alerts[sender.name].dismiss();
-		this.alerts[sender.name] = null;
-		//Remove overlay
-		var overlay = document.getElementById("overlay");
-		overlay.parentNode.removeChild(overlay);
+		if (this.alerts[sender.name]) {
+			this.alerts[sender.name].dismiss();
+			this.alerts[sender.name] = null;
+			//Remove overlay
+			var overlay = document.getElementById("overlay");
+			overlay.parentNode.removeChild(overlay);
+		}
 	},
 	setPosition: function(pos) {
 		//Add css to body depending on the set position for notifications
--- a/modules/default/calendar/README.md
+++ b/modules/default/calendar/README.md
@@ -1,6 +1,7 @@
 # Module: Calendar
 The `calendar` module is one of the default modules of the MagicMirror.
 This module displays events from a public .ical calendar. It can combine multiple calendars.
+Note that calendars may not contain any entry before 1st January 1970, otherwise the calendar won't be displayed and the module will crash.

 ## Using the module

@@ -33,30 +34,34 @@ The following properties can be configured:
 | `maxTitleLength`             | The maximum title length. <br><br> **Possible values:** `10` - `50` <br> **Default value:** `25`
 | `wrapEvents`                 | Wrap event titles to multiple lines. Breaks lines at the length defined by `maxTitleLength`. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `fetchInterval`              | How often does the content needs to be fetched? (Milliseconds) <br><br> **Possible values:** `1000` - `86400000` <br> **Default value:** `300000` (5 minutes)
-| `animationSpeed`             | Speed of the update animation. (Milliseconds) <br><br> **Possible values:**`0` - `5000` <br> **Default value:** `2000` (2 seconds)
+| `animationSpeed`             | Speed of the update animation. (Milliseconds) <br><br> **Possible values:** `0` - `5000` <br> **Default value:** `2000` (2 seconds)
 | `fade`                       | Fade the future events to black. (Gradient) <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
 | `fadePoint`                  | Where to start fade? <br><br> **Possible values:** `0` (top of the list) - `1` (bottom of list) <br> **Default value:** `0.25`
+| `tableClass`                  | Name of the classes issued from `main.css`. <br><br> **Possible values:** xsmall, small, medium, large, xlarge. <br> **Default value:** _small._
 | `calendars`                  | The list of calendars. <br><br> **Possible values:** An array, see _calendar configuration_ below. <br> **Default value:** _An example calendar._
 | `titleReplace`               | An object of textual replacements applied to the tile of the event. This allow to remove or replace certains words in the title. <br><br> **Example:** `{'Birthday of ' : '', 'foo':'bar'}` <br> **Default value:** `{	"De verjaardag van ": "", "'s birthday": ""	}`
 | `displayRepeatingCountTitle` | Show count title for yearly repeating events (e.g. "X. Birthday", "X. Anniversary") <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `dateFormat`                 | Format to use for the date of events (when using absolute dates) <br><br> **Possible values:** See [Moment.js formats](http://momentjs.com/docs/#/parsing/string-format/) <br> **Default value:** `MMM Do` (e.g. Jan 18th)
 | `fullDayEventDateFormat`     | Format to use for the date of full day events (when using absolute dates) <br><br> **Possible values:** See [Moment.js formats](http://momentjs.com/docs/#/parsing/string-format/) <br> **Default value:** `MMM Do` (e.g. Jan 18th)
-| `timeFormat`                 | Display event times as absolute dates, or relative time <br><br> **Possible values:** `absolute` or `relative` <br> **Default value:** `relative`
+| `timeFormat`                 | Display event times as absolute dates, or relative time, or using absolute date headers with times for each event next to it <br><br> **Possible values:** `absolute` or `relative` or `dateheaders` <br> **Default value:** `relative`
 | `getRelative`                | How much time (in hours) should be left until calendar events start getting relative? <br><br> **Possible values:** `0` (events stay absolute) - `48` (48 hours before the event starts) <br> **Default value:** `6`
 | `urgency`                    | When using a timeFormat of `absolute`, the `urgency` setting allows you to display events within a specific time frame as `relative`. This allows events within a certain time frame to be displayed as relative (in xx days) while others are displayed as absolute dates <br><br> **Possible values:** a positive integer representing the number of days for which you want a relative date, for example `7` (for 7 days) <br><br> **Default value:** `7`
 | `broadcastEvents`            | If this property is set to true, the calendar will broadcast all the events to all other modules with the notification message: `CALENDAR_EVENTS`. The event objects are stored in an array and contain the following fields: `title`, `startDate`, `endDate`, `fullDayEvent`, `location` and `geo`. <br><br> **Possible values:** `true`, `false` <br><br> **Default value:** `true`
 | `hidePrivate`                | Hides private calendar events. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
-| `excludedEvents`             | An array of words / phrases from event titles that will be excluded from being shown. <br><br>Additionally advanced filter objects can be passed in. Below is the configuration for the advance filtering object.<br>**Required**<br>`filterBy` - string used to determine if filter is applied.<br>**Optional**<br>`until` - Time before an event to display it  Ex: [`'3 days'`, `'2 months'`, `'1 week'`]<br>`caseSensitive` - By default, excludedEvents are case insensitive, set this to true to enforce case sensitivity<br><br> **Example:** `['Birthday', 'Hide This Event', {filterBy: 'Payment', until: '6 days', caseSensitive: true}]` <br> **Default value:** `[]`
+| `hideOngoing`                | Hides calendar events that have already started. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
+| `excludedEvents`             | An array of words / phrases from event titles that will be excluded from being shown. <br><br>Additionally advanced filter objects can be passed in. Below is the configuration for the advance filtering object.<br>**Required**<br>`filterBy` - string used to determine if filter is applied.<br>**Optional**<br>`until` - Time before an event to display it  Ex: [`'3 days'`, `'2 months'`, `'1 week'`]<br>`caseSensitive` - By default, excludedEvents are case insensitive, set this to true to enforce case sensitivity<br>`regex` - set to `true` if filterBy is a regex. For those not familiar with regex it is used for pattern matching, please see [here](https://regexr.com/) for more info.<br><br> **Example:** `['Birthday', 'Hide This Event', {filterBy: 'Payment', until: '6 days', caseSensitive: true}, {filterBy: '^[0-9]{1,}.*', regex: true}]` <br> **Default value:** `[]`

 ### Calendar configuration

 The `calendars` property contains an array of the configured calendars.
 The `colored` property gives the option for an individual color for each calendar.
+The `coloredSymbolOnly` property will apply color to the symbol only, not the whole line. This is only applicable when `colored` is also enabled.

 #### Default value:
 ````javascript
 config: {
 	colored: false,
+	coloredSymbolOnly: false,
 	calendars: [
 		{
 			url: 'http://www.calendarlabs.com/templates/ical/US-Holidays.ics',
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -29,7 +29,10 @@ Module.register("calendar", {
 		getRelative: 6,
 		fadePoint: 0.25, // Start on 1/4th of the list.
 		hidePrivate: false,
+		hideOngoing: false,
 		colored: false,
+		coloredSymbolOnly: false,
+		tableClass: "small",
 		calendars: [
 			{
 				symbol: "calendar",
@@ -122,19 +125,39 @@ Module.register("calendar", {

 		var events = this.createEventList();
 		var wrapper = document.createElement("table");
-		wrapper.className = "small";
+		wrapper.className = this.config.tableClass;

 		if (events.length === 0) {
 			wrapper.innerHTML = (this.loaded) ? this.translate("EMPTY") : this.translate("LOADING");
-			wrapper.className = "small dimmed";
+			wrapper.className = this.config.tableClass + " dimmed";
 			return wrapper;
 		}

+		var lastSeenDate = "";
+
 		for (var e in events) {
 			var event = events[e];
+			var dateAsString = moment(event.startDate, "x").format(this.config.dateFormat);
+			if(this.config.timeFormat === "dateheaders"){
+				if(lastSeenDate !== dateAsString){
+					var dateRow = document.createElement("tr");
+					dateRow.className = "normal"
+					var dateCell = document.createElement("td");
+
+					dateCell.colSpan = "3";
+					dateCell.innerHTML = dateAsString;
+					dateRow.appendChild(dateCell);
+					wrapper.appendChild(dateRow);
+
+
+					lastSeenDate = dateAsString;
+				}
+			}
+
+
 			var eventWrapper = document.createElement("tr");

-			if (this.config.colored) {
+			if (this.config.colored && !this.config.coloredSymbolOnly) {
 				eventWrapper.style.cssText = "color:" + this.colorForUrl(event.url);
 			}

@@ -142,6 +165,11 @@ Module.register("calendar", {

 			if (this.config.displaySymbol) {
 				var symbolWrapper = document.createElement("td");
+
+				if (this.config.colored && this.config.coloredSymbolOnly) {
+					symbolWrapper.style.cssText = "color:" + this.colorForUrl(event.url);
+				}
+
 				symbolWrapper.className = "symbol align-right";
 				var symbols = this.symbolsForUrl(event.url);
 				if(typeof symbols === "string") {
@@ -157,6 +185,10 @@ Module.register("calendar", {
 					symbolWrapper.appendChild(symbol);
 				}
 				eventWrapper.appendChild(symbolWrapper);
+			}else if(this.config.timeFormat === "dateheaders"){
+				var blankCell = document.createElement("td");
+				blankCell.innerHTML = "&nbsp;&nbsp;&nbsp;"
+				eventWrapper.appendChild(blankCell);
 			}

 			var titleWrapper = document.createElement("td"),
@@ -182,89 +214,123 @@ Module.register("calendar", {
 				titleWrapper.className = "title";
 			}

-			eventWrapper.appendChild(titleWrapper);
+			if(this.config.timeFormat === "dateheaders"){

-			var timeWrapper = document.createElement("td");
-			//console.log(event.today);
-			var now = new Date();
-			// Define second, minute, hour, and day variables
-			var oneSecond = 1000; // 1,000 milliseconds
-			var oneMinute = oneSecond * 60;
-			var oneHour = oneMinute * 60;
-			var oneDay = oneHour * 24;
-			if (event.fullDayEvent) {
-				if (event.today) {
-					timeWrapper.innerHTML = this.capFirst(this.translate("TODAY"));
-				} else if (event.startDate - now < oneDay && event.startDate - now > 0) {
-					timeWrapper.innerHTML = this.capFirst(this.translate("TOMORROW"));
-				} else if (event.startDate - now < 2 * oneDay && event.startDate - now > 0) {
-					if (this.translate("DAYAFTERTOMORROW") !== "DAYAFTERTOMORROW") {
-						timeWrapper.innerHTML = this.capFirst(this.translate("DAYAFTERTOMORROW"));
-					} else {
-						timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+				if (event.fullDayEvent) {
+					titleWrapper.colSpan = "2";
+					titleWrapper.align = "left";
+
+				}else{
+					var timeWrapper = document.createElement("td");
+					timeWrapper.className = "time light";
+					timeWrapper.align = "left";
+					timeWrapper.style.paddingLeft = "2px";
+					var timeFormatString = "";
+					switch (config.timeFormat) {
+					case 12: {
+						timeFormatString = "h:mm A";
+						break;
 					}
-				} else {
-					/* Check to see if the user displays absolute or relative dates with their events
-					 * Also check to see if an event is happening within an 'urgency' time frameElement
-					 * For example, if the user set an .urgency of 7 days, those events that fall within that
-					 * time frame will be displayed with 'in xxx' time format or moment.fromNow()
-					 *
-					 * Note: this needs to be put in its own function, as the whole thing repeats again verbatim
-					 */
-					if (this.config.timeFormat === "absolute") {
-						if ((this.config.urgency > 1) && (event.startDate - now < (this.config.urgency * oneDay))) {
-							// This event falls within the config.urgency period that the user has set
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
-						} else {
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.fullDayEventDateFormat));
-						}
-					} else {
-						timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+					case 24: {
+						timeFormatString = "HH:mm";
+						break;
 					}
+					default: {
+						timeFormatString = "HH:mm";
+						break;
+					}
+					}
+					timeWrapper.innerHTML = moment(event.startDate, "x").format(timeFormatString);
+					eventWrapper.appendChild(timeWrapper);
+					titleWrapper.align = "right";
 				}
-			} else {
-				if (event.startDate >= new Date()) {
-					if (event.startDate - now < 2 * oneDay) {
-						// This event is within the next 48 hours (2 days)
-						if (event.startDate - now < this.config.getRelative * oneHour) {
-							// If event is within 6 hour, display 'in xxx' time format or moment.fromNow()
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+
+				eventWrapper.appendChild(titleWrapper);
+			}else{
+				var timeWrapper = document.createElement("td");
+
+				eventWrapper.appendChild(titleWrapper);
+				//console.log(event.today);
+				var now = new Date();
+				// Define second, minute, hour, and day variables
+				var oneSecond = 1000; // 1,000 milliseconds
+				var oneMinute = oneSecond * 60;
+				var oneHour = oneMinute * 60;
+				var oneDay = oneHour * 24;
+				if (event.fullDayEvent) {
+					if (event.today) {
+						timeWrapper.innerHTML = this.capFirst(this.translate("TODAY"));
+					} else if (event.startDate - now < oneDay && event.startDate - now > 0) {
+						timeWrapper.innerHTML = this.capFirst(this.translate("TOMORROW"));
+					} else if (event.startDate - now < 2 * oneDay && event.startDate - now > 0) {
+						if (this.translate("DAYAFTERTOMORROW") !== "DAYAFTERTOMORROW") {
+							timeWrapper.innerHTML = this.capFirst(this.translate("DAYAFTERTOMORROW"));
 						} else {
-							// Otherwise just say 'Today/Tomorrow at such-n-such time'
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar());
+							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
 						}
 					} else {
 						/* Check to see if the user displays absolute or relative dates with their events
-						 * Also check to see if an event is happening within an 'urgency' time frameElement
-						 * For example, if the user set an .urgency of 7 days, those events that fall within that
-						 * time frame will be displayed with 'in xxx' time format or moment.fromNow()
-						 *
-						 * Note: this needs to be put in its own function, as the whole thing repeats again verbatim
-						 */
+						* Also check to see if an event is happening within an 'urgency' time frameElement
+						* For example, if the user set an .urgency of 7 days, those events that fall within that
+						* time frame will be displayed with 'in xxx' time format or moment.fromNow()
+						*
+						* Note: this needs to be put in its own function, as the whole thing repeats again verbatim
+						*/
 						if (this.config.timeFormat === "absolute") {
 							if ((this.config.urgency > 1) && (event.startDate - now < (this.config.urgency * oneDay))) {
 								// This event falls within the config.urgency period that the user has set
 								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
 							} else {
-								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.dateFormat));
+								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.fullDayEventDateFormat));
 							}
 						} else {
 							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
 						}
 					}
 				} else {
-					timeWrapper.innerHTML = this.capFirst(
-						this.translate("RUNNING", {
-							fallback: this.translate("RUNNING") + " {timeUntilEnd}",
-							timeUntilEnd: moment(event.endDate, "x").fromNow(true)
-						})
-					);
+					if (event.startDate >= new Date()) {
+						if (event.startDate - now < 2 * oneDay) {
+							// This event is within the next 48 hours (2 days)
+							if (event.startDate - now < this.config.getRelative * oneHour) {
+								// If event is within 6 hour, display 'in xxx' time format or moment.fromNow()
+								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+							} else {
+								// Otherwise just say 'Today/Tomorrow at such-n-such time'
+								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar());
+							}
+						} else {
+							/* Check to see if the user displays absolute or relative dates with their events
+							* Also check to see if an event is happening within an 'urgency' time frameElement
+							* For example, if the user set an .urgency of 7 days, those events that fall within that
+							* time frame will be displayed with 'in xxx' time format or moment.fromNow()
+							*
+							* Note: this needs to be put in its own function, as the whole thing repeats again verbatim
+							*/
+							if (this.config.timeFormat === "absolute") {
+								if ((this.config.urgency > 1) && (event.startDate - now < (this.config.urgency * oneDay))) {
+									// This event falls within the config.urgency period that the user has set
+									timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+								} else {
+									timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.dateFormat));
+								}
+							} else {
+								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+							}
+						}
+					} else {
+						timeWrapper.innerHTML = this.capFirst(
+							this.translate("RUNNING", {
+								fallback: this.translate("RUNNING") + " {timeUntilEnd}",
+								timeUntilEnd: moment(event.endDate, "x").fromNow(true)
+							})
+						);
+					}
 				}
+				//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');
+				//console.log(event);
+				timeWrapper.className = "time light";
+				eventWrapper.appendChild(timeWrapper);
 			}
-			//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');
-			//console.log(event);
-			timeWrapper.className = "time light";
-			eventWrapper.appendChild(timeWrapper);

 			wrapper.appendChild(eventWrapper);

@@ -336,6 +402,7 @@ Module.register("calendar", {
 	createEventList: function () {
 		var events = [];
 		var today = moment().startOf("day");
+		var now = new Date();
 		for (var c in this.calendarData) {
 			var calendar = this.calendarData[c];
 			for (var e in calendar) {
@@ -346,6 +413,14 @@ Module.register("calendar", {
 						  continue;
 					}
 				}
+				if(this.config.hideOngoing) {
+					if(event.startDate < now) {
+						continue;
+					}
+				}
+				if(this.listContainsEvent(events,event)){
+					continue;
+				}
 				event.url = c;
 				event.today = event.startDate >= today && event.startDate < (today + 24 * 60 * 60 * 1000);
 				events.push(event);
@@ -359,6 +434,17 @@ Module.register("calendar", {
 		return events.slice(0, this.config.maximumEntries);
 	},

+
+	listContainsEvent: function(eventList, event){
+		for(let evt of eventList){
+			if(evt.title === event.title && parseInt(evt.startDate) === parseInt(event.startDate)){
+				return true;
+			}
+		}
+		return false;
+
+	},
+
 	/* createEventList(url)
 	 * Requests node helper to add calendar url.
 	 *
--- a/modules/default/calendar/calendarfetcher.js
+++ b/modules/default/calendar/calendarfetcher.js
@@ -119,19 +119,29 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 					for (var f in excludedEvents) {
 						var filter = excludedEvents[f],
 							testTitle = title.toLowerCase(),
-							until = null;
+							until = null,
+							useRegex = false,
+							regexFlags = "g";

 						if (filter instanceof Object) {
 							if (typeof filter.until !== "undefined") {
 								until = filter.until;
 							}

+							if (typeof filter.regex !== "undefined") {
+								useRegex = filter.regex;
+							}
+
 							// If additional advanced filtering is added in, this section
 							// must remain last as we overwrite the filter object with the
 							// filterBy string
 							if (filter.caseSensitive) {
 								filter = filter.filterBy;
 								testTitle = title;
+							} else if (useRegex) {
+								filter = filter.filterBy;
+								testTitle = title;
+								regexFlags += "i";
 							} else {
 								filter = filter.filterBy.toLowerCase();
 							}
@@ -139,7 +149,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 							filter = filter.toLowerCase();
 						}

-						if (testTitle.includes(filter)) {
+						if (testTitleByFilter(testTitle, filter, useRegex, regexFlags)) {
 							if (until) {
 								dateFilter = until;
 							} else {
@@ -294,6 +304,22 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 		return false;
 	};

+	var testTitleByFilter = function (title, filter, useRegex, regexFlags) {
+		if (useRegex) {
+			// Assume if leading slash, there is also trailing slash
+			if (filter[0] === "/") {
+				// Strip leading and trailing slashes
+				filter = filter.substr(1).slice(0, -1);
+			}
+
+			filter = new RegExp(filter, regexFlags);
+
+			return filter.test(title);
+		} else {
+			return title.includes(filter);
+		}
+	}
+
 	/* public methods */

 	/* startFetch()
--- a/modules/default/compliments/README.md
+++ b/modules/default/compliments/README.md
@@ -30,7 +30,7 @@ The following properties can be configured:
 | `updateInterval` | How often does the compliment have to change? (Milliseconds) <br><br> **Possible values:** `1000` - `86400000` <br> **Default value:** `30000` (30 seconds)
 | `fadeSpeed`      | Speed of the update animation. (Milliseconds) <br><br> **Possible values:**`0` - `5000` <br> **Default value:** `4000` (4 seconds)
 | `compliments`	   | The list of compliments. <br><br> **Possible values:** An object with four arrays: `morning`, `afternoon`, `evening` and `anytime`. See _compliment configuration_ below. <br> **Default value:** See _compliment configuration_ below.
-| `remoteFile`     | External file from which to load the compliments <br><br> **Possible values:** Path to a JSON file containing compliments, configured as per the value of the _compliments configuration_ (see below). An object with four arrays: `morning`, `afternoon`, `evening` and `anytime`. - `compliments.json` <br> **Default value:** `null` (Do not load from file)
+| `remoteFile`     | External file from which to load the compliments <br><br> **Possible values:** Path or URL (starting with `http://` or `https://`) to a JSON file containing compliments, configured as per the value of the _compliments configuration_ (see below). An object with four arrays: `morning`, `afternoon`, `evening` and `anytime`. - `compliments.json` <br> **Default value:** `null` (Do not load from file)
 | `classes`        | Override the CSS classes of the div showing the compliments <br><br> **Default value:** `thin xlarge bright`
 | `morningStartTime`        |  Time in hours (in 24 format), after which the mode of "morning" will begin <br> **Possible values:** `0` - `24` <br><br> **Default value:** `3`
 | `morningEndTime`        |  Time in hours (in 24 format), after which the mode of "morning" will end <br> **Possible values:** `0` - `24` <br><br> **Default value:** `12`
--- a/modules/default/compliments/compliments.js
+++ b/modules/default/compliments/compliments.js
@@ -55,8 +55,8 @@ Module.register("compliments", {

 		var self = this;
 		if (this.config.remoteFile != null) {
-			this.complimentFile((response) => {
-				this.config.compliments = JSON.parse(response);
+			this.complimentFile(function(response) {
+				self.config.compliments = JSON.parse(response);
 				self.updateDom();
 			});
 		}
@@ -128,9 +128,11 @@ Module.register("compliments", {
 	 * Retrieve a file from the local filesystem
 	 */
 	complimentFile: function(callback) {
-		var xobj = new XMLHttpRequest();
+		var xobj = new XMLHttpRequest(),
+			isRemote = this.config.remoteFile.indexOf("http://") === 0 || this.config.remoteFile.indexOf("https://") === 0,
+			path = isRemote ? this.config.remoteFile : this.file(this.config.remoteFile);
 		xobj.overrideMimeType("application/json");
-		xobj.open("GET", this.file(this.config.remoteFile), true);
+		xobj.open("GET", path, true);
 		xobj.onreadystatechange = function() {
 			if (xobj.readyState == 4 && xobj.status == "200") {
 				callback(xobj.responseText);
@@ -197,4 +199,4 @@ Module.register("compliments", {
 		}
 	},

-});
+});
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -67,7 +67,7 @@ Module.register("currentweather",{
 		},
 	},

-	// create a variable for the first upcoming calendaar event. Used if no location is specified.
+	// create a variable for the first upcoming calendar event. Used if no location is specified.
 	firstEvent: false,

 	// create a variable to hold the location name based on the API result.
@@ -87,7 +87,7 @@ Module.register("currentweather",{
 	getTranslations: function() {
 		// The translations for the default modules are defined in the core translation files.
 		// Therefor we can just return false. Otherwise we should have returned a dictionary.
-		// If you're trying to build yiur own module including translations, check out the documentation.
+		// If you're trying to build your own module including translations, check out the documentation.
 		return false;
 	},

@@ -251,7 +251,7 @@ Module.register("currentweather",{

 			var feelsLike = document.createElement("span");
 			feelsLike.className = "dimmed";
-			feelsLike.innerHTML = "Feels " + this.feelsLike + "&deg;" + degreeLabel;
+			feelsLike.innerHTML = this.translate("FEELS") + " " + this.feelsLike + "&deg;" + degreeLabel;
 			small.appendChild(feelsLike);

 			wrapper.appendChild(small);
@@ -293,11 +293,11 @@ Module.register("currentweather",{
 		}
 		if (notification === "INDOOR_TEMPERATURE") {
 			this.indoorTemperature = this.roundValue(payload);
-			this.updateDom(self.config.animationSpeed);
+			this.updateDom(this.config.animationSpeed);
 		}
 		if (notification === "INDOOR_HUMIDITY") {
 			this.indoorHumidity = this.roundValue(payload);
-			this.updateDom(self.config.animationSpeed);
+			this.updateDom(this.config.animationSpeed);
 		}
 	},

@@ -407,8 +407,8 @@ Module.register("currentweather",{

 		if (windInMph > 3 && tempInF < 50){
 			// windchill
-			var windchillinF = Math.round(35.74+0.6215*tempInF-35.75*Math.pow(windInMph,0.16)+0.4275*tempInF*Math.pow(windInMph,0.16));
-			var windChillInC = (windchillinF - 32) * (5/9);
+			var windChillInF = Math.round(35.74+0.6215*tempInF-35.75*Math.pow(windInMph,0.16)+0.4275*tempInF*Math.pow(windInMph,0.16));
+			var windChillInC = (windChillInF - 32) * (5/9);
 			// this.feelsLike = windChillInC.toFixed(0);

 			switch (this.config.units){
@@ -417,7 +417,7 @@ Module.register("currentweather",{
 			case "imperial": this.feelsLike = windChillInF.toFixed(0);
 				break;
 			case "default":
-				var tc = windChillInC - 273.15;
+				var tc = windChillInC + 273.15;
 				this.feelsLike = tc.toFixed(0);
 				break;
 			}
@@ -432,12 +432,12 @@ Module.register("currentweather",{
 				- 1.99*Math.pow(10,-6)*tempInF*tempInF*this.humidity*this.humidity;

 			switch (this.config.units){
-			case "metric": this.feelsLike = Hindex.toFixed(0);
+			case "metric": this.feelsLike = parseFloat((Hindex - 32) / 1.8).toFixed(0);
 				break;
-			case "imperial": this.feelsLike = parseFloat(Hindex * 1.8 + 32).toFixed(0);
+			case "imperial": this.feelsLike = Hindex.toFixed(0);
 				break;
 			case "default":
-				var tc = Hindex - 273.15;
+				var tc = parseFloat((Hindex - 32) / 1.8) + 273.15;
 				this.feelsLike = tc.toFixed(0);
 				break;
 			}
--- a/modules/default/newsfeed/README.md
+++ b/modules/default/newsfeed/README.md
@@ -80,6 +80,7 @@ The following properties can be configured:
 | `endTags`          | List the tags you would like to have removed at the end of the feed item <br><br> **Possible values:** `['TAG']` or `['TAG1','TAG2',...]`
 | `prohibitedWords` | Remove news feed item if one of these words is found anywhere in the title (case insensitive and greedy matching) <br><br> **Possible values:** `['word']` or `['word1','word2',...]`
 | `scrollLength` | Scrolls the full news article page by a given number of pixels when a `ARTICLE_MORE_DETAILS` notification is received and the full news article is already displayed.<br><br> **Possible values:** `1` or `10000` <br> **Default value:** `500`
+| `logFeedWarnings` | Log warnings when there is an error parsing a news article. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`

 The `feeds` property contains an array with multiple objects. These objects have the following properties:

--- a/modules/default/newsfeed/fetcher.js
+++ b/modules/default/newsfeed/fetcher.js
@@ -14,9 +14,10 @@ var iconv = require("iconv-lite");
 *
 * attribute url string - URL of the news feed.
 * attribute reloadInterval number - Reload interval in milliseconds.
+ * attribute logFeedWarnings boolean - Log warnings when there is an error parsing a news article.
 */

-var Fetcher = function(url, reloadInterval, encoding) {
+var Fetcher = function(url, reloadInterval, encoding, logFeedWarnings) {
 	var self = this;
 	if (reloadInterval < 1000) {
 		reloadInterval = 1000;
@@ -60,7 +61,7 @@ var Fetcher = function(url, reloadInterval, encoding) {
 					url: url,
 				});

-			} else {
+			} else if (logFeedWarnings) {
 				console.log("Can't parse feed item:");
 				console.log(item);
 				console.log("Title: " + title);
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -37,7 +37,8 @@ Module.register("newsfeed",{
 		startTags: [],
 		endTags: [],
 		prohibitedWords: [],
-		scrollLength: 500
+		scrollLength: 500,
+		logFeedWarnings: false
 	},

 	// Define required scripts.
@@ -67,6 +68,7 @@ Module.register("newsfeed",{

 		this.registerFeeds();

+		this.isShowingDescription = this.config.showDescription;
 	},

 	// Override socket notification handler.
@@ -133,7 +135,7 @@ Module.register("newsfeed",{

 			if (this.config.removeStartTags == "description" || this.config.removeStartTags == "both") {

-				if (this.config.showDescription) {
+				if (this.isShowingDescription) {
 					for (f=0; f<this.config.startTags.length;f++) {
 						if (this.newsItems[this.activeItem].description.slice(0,this.config.startTags[f].length) == this.config.startTags[f]) {
 							this.newsItems[this.activeItem].title = this.newsItems[this.activeItem].description.slice(this.config.startTags[f].length,this.newsItems[this.activeItem].description.length);
@@ -152,7 +154,7 @@ Module.register("newsfeed",{
 					}
 				}

-				if (this.config.showDescription) {
+				if (this.isShowingDescription) {
 					for (f=0; f<this.config.endTags.length;f++) {
 						if (this.newsItems[this.activeItem].description.slice(-this.config.endTags[f].length)==this.config.endTags[f]) {
 							this.newsItems[this.activeItem].description = this.newsItems[this.activeItem].description.slice(0,-this.config.endTags[f].length);
@@ -169,7 +171,7 @@ Module.register("newsfeed",{
 				wrapper.appendChild(title);
 			}

-			if (this.config.showDescription) {
+			if (this.isShowingDescription) {
 				var description = document.createElement("div");
 				description.className = "small light" + (!this.config.wrapDescription ? " no-wrap" : "");
 				var txtDesc = this.newsItems[this.activeItem].description;
@@ -180,10 +182,10 @@ Module.register("newsfeed",{
 			if (this.config.showFullArticle) {
 				var fullArticle = document.createElement("iframe");
 				fullArticle.className = "";
-				fullArticle.style.width = "100%";
+				fullArticle.style.width = "100vw";
 				// very large height value to allow scrolling
-				fullArticle.height = "10000";
-				fullArticle.style.height = "10000";
+				fullArticle.height = "3000";
+				fullArticle.style.height = "3000";
 				fullArticle.style.top = "0";
 				fullArticle.style.left = "0";
 				fullArticle.style.border = "none";
@@ -323,7 +325,7 @@ Module.register("newsfeed",{
 	},

 	resetDescrOrFullArticleAndTimer: function() {
-		this.config.showDescription = false;
+		this.isShowingDescription = this.config.showDescription;
 		this.config.showFullArticle = false;
 		this.scrollPosition = 0;
 		// reset bottom bar alignment
@@ -366,8 +368,8 @@ Module.register("newsfeed",{
 			}
 			// display full article
 			else {
-				this.config.showDescription = !this.config.showDescription;
-				this.config.showFullArticle = !this.config.showDescription;
+				this.isShowingDescription = !this.isShowingDescription;
+				this.config.showFullArticle = !this.isShowingDescription;
 				// make bottom bar align to top to allow scrolling
 				if(this.config.showFullArticle == true){
 					document.getElementsByClassName("region bottom bar")[0].style.bottom = "inherit";
@@ -375,9 +377,16 @@ Module.register("newsfeed",{
 				}
 				clearInterval(timer);
 				timer = null;
-				Log.info(this.name + " - showing " + this.config.showDescription ? "article description" : "full article");
+				Log.info(this.name + " - showing " + this.isShowingDescription ? "article description" : "full article");
 				this.updateDom(100);
 			}
+		} else if(notification == "ARTICLE_SCROLL_UP"){
+			if(this.config.showFullArticle == true){
+				this.scrollPosition -= this.config.scrollLength;
+				window.scrollTo(0, this.scrollPosition);
+				Log.info(this.name + " - scrolling up");
+				Log.info(this.name + " - ARTICLE_SCROLL_UP, scroll position: " + this.config.scrollLength);
+			}
 		} else if(notification == "ARTICLE_LESS_DETAILS"){
 			this.resetDescrOrFullArticleAndTimer();
 			Log.info(this.name + " - showing only article titles again");
--- a/modules/default/newsfeed/node_helper.js
+++ b/modules/default/newsfeed/node_helper.js
@@ -46,7 +46,7 @@ module.exports = NodeHelper.create({
 		var fetcher;
 		if (typeof self.fetchers[url] === "undefined") {
 			console.log("Create new news fetcher for url: " + url + " - Interval: " + reloadInterval);
-			fetcher = new Fetcher(url, reloadInterval, encoding);
+			fetcher = new Fetcher(url, reloadInterval, encoding, config.logFeedWarnings);

 			fetcher.onReceive(function(fetcher) {
 				self.broadcastFeeds();
--- a/modules/default/weatherforecast/README.md
+++ b/modules/default/weatherforecast/README.md
@@ -35,7 +35,7 @@ The following properties can be configured:
 | `maxNumberOfDays`            | How many days of forecast to return. Specified by config.js <br><br> **Possible values:** `1` - `16` <br> **Default value:** `7` (7 days) <br> This value is optional. By default the weatherforecast module will return 7 days.
 | `showRainAmount`             | Should the predicted rain amount be displayed? <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false` <br> This value is optional. By default the weatherforecast module will not display the predicted amount of rain.
 | `updateInterval`             | How often does the content needs to be fetched? (Milliseconds) <br><br> **Possible values:** `1000` - `86400000` <br> **Default value:** `600000` (10 minutes)
-| `animationSpeed`             | Speed of the update animation. (Milliseconds) <br><br> **Possible values:**`0` - `5000` <br> **Default value:** `1000` (1 second)
+| `animationSpeed`             | Speed of the update animation. (Milliseconds) <br><br> **Possible values:** `0` - `5000` <br> **Default value:** `1000` (1 second)
 | `lang`                       | The language of the days. <br><br> **Possible values:** `en`, `nl`, `ru`, etc ... <br> **Default value:** uses value of _config.language_
 | `decimalSymbol`              | The decimal symbol to use.<br><br> **Possible values:** `.`, `,` or any other symbol.<br> **Default value:** `.`
 | `fade`                       | Fade the future events to black. (Gradient) <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
@@ -47,6 +47,7 @@ The following properties can be configured:
 | `forecastEndpoint`           | The OpenWeatherMap API endPoint. <br><br> **Default value:**  `'forecast/daily'`
 | `appendLocationNameToHeader` | If set to `true`, the returned location name will be appended to the header of the module, if the header is enabled. This is mainly intresting when using calender based weather. <br><br> **Default value:**  `true`
 | `calendarClass`              | The class for the calender module to base the event based weather information on. <br><br> **Default value:** `'calendar'`
+| `tableClass`                  | Name of the classes issued from `main.css`. <br><br> **Possible values:** xsmall, small, medium, large, xlarge. <br> **Default value:** _small._
 | `iconTable`                  | The conversion table to convert the weather conditions to weather-icons. <br><br> **Default value:** view table below
  `colored`                    | If set 'colored' to true the min-temp get a blue tone and the max-temp get a red tone. <br><br> **Default value:** `'false'`

--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -36,6 +36,7 @@ Module.register("weatherforecast",{

 		appendLocationNameToHeader: true,
 		calendarClass: "calendar",
+		tableClass: "small",

 		roundTemp: false,

@@ -117,7 +118,7 @@ Module.register("weatherforecast",{
 		}

 		var table = document.createElement("table");
-		table.className = "small";
+		table.className = this.config.tableClass;

 		for (var f in this.forecast) {
 			var forecast = this.forecast[f];
@@ -333,8 +334,15 @@ Module.register("weatherforecast",{
 			var forecast = data.list[i];
 			this.parserDataWeather(forecast); // hack issue #1017

-			var day = moment(forecast.dt, "X").format("ddd");
-			var hour = moment(forecast.dt, "X").format("H");
+			var day;
+			var hour;
+			if(!!forecast.dt_txt) {
+				day = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("ddd");
+				hour = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("H");
+			} else {
+				day = moment(forecast.dt, "X").format("ddd");
+				hour = moment(forecast.dt, "X").format("H");
+			}

 			if (day !== lastDay) {
 				var forecastData = {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
  "name": "magicmirror",
-  "version": "2.3.0",
+  "version": "2.4.1",
  "description": "The open source modular smart mirror platform.",
  "main": "js/electron.js",
  "scripts": {
    "start": "sh run-start.sh",
-    "install": "cd vendor && yon install",
-    "install-fonts": "cd fonts && yon install",
-    "postinstall": "sh installers/postinstall/postinstall.sh && yon run install-fonts",
+    "install": "cd vendor && npm install",
+    "install-fonts": "cd fonts && npm install",
+    "postinstall": "sh installers/postinstall/postinstall.sh && npm run install-fonts",
    "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive",
    "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
    "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
@@ -52,13 +52,12 @@
    "spectron": "3.7.x",
    "stylelint": "^8.4.0",
    "stylelint-config-standard": "latest",
-    "time-grunt": "latest",
-    "yarn-or-npm": "^2.0.4"
+    "time-grunt": "latest"
  },
  "dependencies": {
    "body-parser": "^1.18.2",
    "colors": "^1.1.2",
-    "electron": "^1.7.13",
+    "electron": "^2.0.0",
    "express": "^4.16.2",
    "express-ipfilter": "0.3.1",
    "feedme": "latest",
--- a/translations/de.json
+++ b/translations/de.json
@@ -28,5 +28,7 @@

 	"UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.",
 	"UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.",
-	"UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} branch."
+	"UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} Branch.",
+	
+	"FEELS": "Gefühlt"
 }
--- a/translations/en.json
+++ b/translations/en.json
@@ -28,5 +28,7 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² update available.",
 	"UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.",
-	"UPDATE_INFO": "The current installation is {COMMIT_COUNT} behind on the {BRANCH_NAME} branch."
+	"UPDATE_INFO": "The current installation is {COMMIT_COUNT} behind on the {BRANCH_NAME} branch.",
+	
+	"FEELS": "Feels"
 }
--- a/translations/it.json
+++ b/translations/it.json
@@ -3,8 +3,11 @@

 	"TODAY": "Oggi",
 	"TOMORROW": "Domani",
+	"DAYAFTERTOMORROW": "Dopodomani",
 	"RUNNING": "Termina entro",
-	"EMPTY": "Nessun evento in arrivo.",
+	"EMPTY": "Nessun evento imminente.",
+
+	"WEEK": "Settimana {weekNumber}",

 	"N": "N",
 	"NNE": "NNE",
@@ -15,11 +18,15 @@
 	"SE": "SE",
 	"SSE": "SSE",
 	"S": "S",
-	"SSW": "SSW",
-	"SW": "SW",
-	"WSW": "WSW",
-	"W": "W",
-	"WNW": "WNW",
-	"NW": "NW",
-	"NNW": "NNW"
+	"SSW": "SSO",
+	"SW": "SO",
+	"WSW": "OSO",
+	"W": "O",
+	"WNW": "ONO",
+	"NW": "NO",
+	"NNW": "NNO",
+
+	"UPDATE_NOTIFICATION": "E' disponibile un aggiornamento di MagicMirror².",
+	"UPDATE_NOTIFICATION_MODULE": "E' disponibile un aggiornamento del modulo {MODULE_NAME}.",
+	"UPDATE_INFO": "L'installazione è {COMMIT_COUNT} indietro rispetto all'attuale branch {BRANCH_NAME}."
 }
--- a/translations/nl.json
+++ b/translations/nl.json
@@ -26,5 +26,7 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.",
 	"UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.",
-	"UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} achter op de {BRANCH_NAME} branch."
+	"UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} achter op de {BRANCH_NAME} branch.",
+	
+	"FEELS": "Gevoelstemperatuur"
 }
--- a/translations/pt-br.json
+++ b/translations/pt-br.json
@@ -21,5 +21,9 @@
 	"W": "O",
 	"WNW": "ONO",
 	"NW": "NO",
-	"NNW": "NNO"
+	"NNW": "NNO",
+
+	"UPDATE_NOTIFICATION": "Nova atualização para MagicMirror disponível.",
+	"UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.",
+	"UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} dentro do seguinte branch {BRANCH_NAME}."
 }
--- a/translations/translations.js
+++ b/translations/translations.js
@@ -17,12 +17,12 @@ var translations = {
 	"nb" : "translations/nb.json", // Norsk bokmål
 	"nn" : "translations/nn.json", // Norsk nynorsk
 	"pt" : "translations/pt.json", // Português
-	"pt_br" : "translations/pt_br.json", // Português Brasileiro
+	"pt-br" : "translations/pt-br.json", // Português Brasileiro
 	"sv" : "translations/sv.json", // Svenska
 	"id" : "translations/id.json", // Indonesian
 	"it" : "translations/it.json", // Italian
-	"zh_cn" : "translations/zh_cn.json", // Simplified Chinese
-	"zh_tw" : "translations/zh_tw.json", // Traditional Chinese
+	"zh-cn" : "translations/zh-cn.json", // Simplified Chinese
+	"zh-tw" : "translations/zh-tw.json", // Traditional Chinese
 	"ja" : "translations/ja.json", // Japanese
 	"pl" : "translations/pl.json", // Polish
 	"gr" : "translations/gr.json", // Greek
--- a/translations/zh-cn.json
+++ b/translations/zh-cn.json
--- a/translations/zh-tw.json
+++ b/translations/zh-tw.json
--- a/vendor/package-lock.json
+++ b/vendor/package-lock.json
@@ -19,8 +19,8 @@
      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
      "optional": true,
      "requires": {
-        "micromatch": "2.3.11",
-        "normalize-path": "2.1.1"
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
      }
    },
    "arr-diff": {
@@ -29,7 +29,7 @@
      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
      "optional": true,
      "requires": {
-        "arr-flatten": "1.1.0"
+        "arr-flatten": "^1.0.1"
      }
    },
    "arr-flatten": {
@@ -73,7 +73,7 @@
      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
      "optional": true,
      "requires": {
-        "balanced-match": "1.0.0",
+        "balanced-match": "^1.0.0",
        "concat-map": "0.0.1"
      }
    },
@@ -83,9 +83,9 @@
      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
      "optional": true,
      "requires": {
-        "expand-range": "1.8.2",
-        "preserve": "0.2.0",
-        "repeat-element": "1.1.2"
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
      }
    },
    "camelcase": {
@@ -99,15 +99,15 @@
      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
      "optional": true,
      "requires": {
-        "anymatch": "1.3.2",
-        "async-each": "1.0.1",
-        "fsevents": "1.1.2",
-        "glob-parent": "2.0.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "2.0.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.1.0"
+        "anymatch": "^1.3.0",
+        "async-each": "^1.0.0",
+        "fsevents": "^1.0.0",
+        "glob-parent": "^2.0.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^2.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0"
      }
    },
    "cliui": {
@@ -115,9 +115,9 @@
      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
      }
    },
    "code-point-at": {
@@ -148,7 +148,7 @@
      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
      "optional": true,
      "requires": {
-        "is-posix-bracket": "0.1.1"
+        "is-posix-bracket": "^0.1.0"
      }
    },
    "expand-range": {
@@ -157,7 +157,7 @@
      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
      "optional": true,
      "requires": {
-        "fill-range": "2.2.3"
+        "fill-range": "^2.1.0"
      }
    },
    "extglob": {
@@ -166,7 +166,7 @@
      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
      "optional": true,
      "requires": {
-        "is-extglob": "1.0.0"
+        "is-extglob": "^1.0.0"
      }
    },
    "filename-regex": {
@@ -181,11 +181,11 @@
      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
      "optional": true,
      "requires": {
-        "is-number": "2.1.0",
-        "isobject": "2.1.0",
-        "randomatic": "1.1.7",
-        "repeat-element": "1.1.2",
-        "repeat-string": "1.6.1"
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^1.1.3",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
      }
    },
    "font-awesome": {
@@ -205,7 +205,7 @@
      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
      "optional": true,
      "requires": {
-        "for-in": "1.0.2"
+        "for-in": "^1.0.1"
      }
    },
    "fsevents": {
@@ -214,8 +214,8 @@
      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
      "optional": true,
      "requires": {
-        "nan": "2.7.0",
-        "node-pre-gyp": "0.6.36"
+        "nan": "^2.3.0",
+        "node-pre-gyp": "^0.6.36"
      },
      "dependencies": {
        "abbrev": {
@@ -228,8 +228,8 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
+            "co": "^4.6.0",
+            "json-stable-stringify": "^1.0.1"
          }
        },
        "ansi-regex": {
@@ -246,8 +246,8 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
          }
        },
        "asn1": {
@@ -284,28 +284,28 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "tweetnacl": "0.14.5"
+            "tweetnacl": "^0.14.3"
          }
        },
        "block-stream": {
          "version": "0.0.9",
          "bundled": true,
          "requires": {
-            "inherits": "2.0.3"
+            "inherits": "~2.0.0"
          }
        },
        "boom": {
          "version": "2.10.1",
          "bundled": true,
          "requires": {
-            "hoek": "2.16.3"
+            "hoek": "2.x.x"
          }
        },
        "brace-expansion": {
          "version": "1.1.7",
          "bundled": true,
          "requires": {
-            "balanced-match": "0.4.2",
+            "balanced-match": "^0.4.1",
            "concat-map": "0.0.1"
          }
        },
@@ -331,7 +331,7 @@
          "version": "1.0.5",
          "bundled": true,
          "requires": {
-            "delayed-stream": "1.0.0"
+            "delayed-stream": "~1.0.0"
          }
        },
        "concat-map": {
@@ -351,7 +351,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "boom": "2.10.1"
+            "boom": "2.x.x"
          }
        },
        "dashdash": {
@@ -359,7 +359,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "assert-plus": "1.0.0"
+            "assert-plus": "^1.0.0"
          },
          "dependencies": {
            "assert-plus": {
@@ -396,7 +396,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "jsbn": "0.1.1"
+            "jsbn": "~0.1.0"
          }
        },
        "extend": {
@@ -418,9 +418,9 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.5",
+            "mime-types": "^2.1.12"
          }
        },
        "fs.realpath": {
@@ -431,10 +431,10 @@
          "version": "1.0.11",
          "bundled": true,
          "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
+            "graceful-fs": "^4.1.2",
+            "inherits": "~2.0.0",
+            "mkdirp": ">=0.5 0",
+            "rimraf": "2"
          }
        },
        "fstream-ignore": {
@@ -442,9 +442,9 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
+            "fstream": "^1.0.0",
+            "inherits": "2",
+            "minimatch": "^3.0.0"
          }
        },
        "gauge": {
@@ -452,14 +452,14 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "aproba": "1.1.1",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
          }
        },
        "getpass": {
@@ -467,7 +467,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "assert-plus": "1.0.0"
+            "assert-plus": "^1.0.0"
          },
          "dependencies": {
            "assert-plus": {
@@ -481,12 +481,12 @@
          "version": "7.1.2",
          "bundled": true,
          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
          }
        },
        "graceful-fs": {
@@ -503,8 +503,8 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
+            "ajv": "^4.9.1",
+            "har-schema": "^1.0.5"
          }
        },
        "has-unicode": {
@@ -517,10 +517,10 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
+            "boom": "2.x.x",
+            "cryptiles": "2.x.x",
+            "hoek": "2.x.x",
+            "sntp": "1.x.x"
          }
        },
        "hoek": {
@@ -532,17 +532,17 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
+            "assert-plus": "^0.2.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
          }
        },
        "inflight": {
          "version": "1.0.6",
          "bundled": true,
          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "once": "^1.3.0",
+            "wrappy": "1"
          }
        },
        "inherits": {
@@ -558,7 +558,7 @@
          "version": "1.0.0",
          "bundled": true,
          "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
          }
        },
        "is-typedarray": {
@@ -580,7 +580,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "jsbn": "0.1.1"
+            "jsbn": "~0.1.0"
          }
        },
        "jsbn": {
@@ -598,7 +598,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "jsonify": "0.0.0"
+            "jsonify": "~0.0.0"
          }
        },
        "json-stringify-safe": {
@@ -637,14 +637,14 @@
          "version": "2.1.15",
          "bundled": true,
          "requires": {
-            "mime-db": "1.27.0"
+            "mime-db": "~1.27.0"
          }
        },
        "minimatch": {
          "version": "3.0.4",
          "bundled": true,
          "requires": {
-            "brace-expansion": "1.1.7"
+            "brace-expansion": "^1.1.7"
          }
        },
        "minimist": {
@@ -668,15 +668,15 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.0",
-            "rc": "1.2.1",
-            "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
-            "tar": "2.2.1",
-            "tar-pack": "3.4.0"
+            "mkdirp": "^0.5.1",
+            "nopt": "^4.0.1",
+            "npmlog": "^4.0.2",
+            "rc": "^1.1.7",
+            "request": "^2.81.0",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^2.2.1",
+            "tar-pack": "^3.4.0"
          }
        },
        "nopt": {
@@ -684,8 +684,8 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
          }
        },
        "npmlog": {
@@ -693,10 +693,10 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
          }
        },
        "number-is-nan": {
@@ -717,7 +717,7 @@
          "version": "1.4.0",
          "bundled": true,
          "requires": {
-            "wrappy": "1.0.2"
+            "wrappy": "1"
          }
        },
        "os-homedir": {
@@ -735,8 +735,8 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
          }
        },
        "path-is-absolute": {
@@ -767,10 +767,10 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
+            "deep-extend": "~0.4.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
          },
          "dependencies": {
            "minimist": {
@@ -784,13 +784,13 @@
          "version": "2.2.9",
          "bundled": true,
          "requires": {
-            "buffer-shims": "1.0.0",
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "1.0.1",
-            "util-deprecate": "1.0.2"
+            "buffer-shims": "~1.0.0",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~1.0.6",
+            "string_decoder": "~1.0.0",
+            "util-deprecate": "~1.0.1"
          }
        },
        "request": {
@@ -798,35 +798,35 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.0.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.0.1"
+            "aws-sign2": "~0.6.0",
+            "aws4": "^1.2.1",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.5",
+            "extend": "~3.0.0",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.1.1",
+            "har-validator": "~4.2.1",
+            "hawk": "~3.1.3",
+            "http-signature": "~1.1.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.7",
+            "oauth-sign": "~0.8.1",
+            "performance-now": "^0.2.0",
+            "qs": "~6.4.0",
+            "safe-buffer": "^5.0.1",
+            "stringstream": "~0.0.4",
+            "tough-cookie": "~2.3.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.0.0"
          }
        },
        "rimraf": {
          "version": "2.6.1",
          "bundled": true,
          "requires": {
-            "glob": "7.1.2"
+            "glob": "^7.0.5"
          }
        },
        "safe-buffer": {
@@ -853,7 +853,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "hoek": "2.16.3"
+            "hoek": "2.x.x"
          }
        },
        "sshpk": {
@@ -861,15 +861,15 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "asn1": "0.2.3",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.1",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.1",
-            "getpass": "0.1.7",
-            "jodid25519": "1.0.2",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
+            "asn1": "~0.2.3",
+            "assert-plus": "^1.0.0",
+            "bcrypt-pbkdf": "^1.0.0",
+            "dashdash": "^1.12.0",
+            "ecc-jsbn": "~0.1.1",
+            "getpass": "^0.1.1",
+            "jodid25519": "^1.0.0",
+            "jsbn": "~0.1.0",
+            "tweetnacl": "~0.14.0"
          },
          "dependencies": {
            "assert-plus": {
@@ -883,16 +883,16 @@
          "version": "1.0.2",
          "bundled": true,
          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
          }
        },
        "string_decoder": {
          "version": "1.0.1",
          "bundled": true,
          "requires": {
-            "safe-buffer": "5.0.1"
+            "safe-buffer": "^5.0.1"
          }
        },
        "stringstream": {
@@ -904,7 +904,7 @@
          "version": "3.0.1",
          "bundled": true,
          "requires": {
-            "ansi-regex": "2.1.1"
+            "ansi-regex": "^2.0.0"
          }
        },
        "strip-json-comments": {
@@ -916,9 +916,9 @@
          "version": "2.2.1",
          "bundled": true,
          "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
+            "block-stream": "*",
+            "fstream": "^1.0.2",
+            "inherits": "2"
          }
        },
        "tar-pack": {
@@ -926,14 +926,14 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "debug": "2.6.8",
-            "fstream": "1.0.11",
-            "fstream-ignore": "1.0.5",
-            "once": "1.4.0",
-            "readable-stream": "2.2.9",
-            "rimraf": "2.6.1",
-            "tar": "2.2.1",
-            "uid-number": "0.0.6"
+            "debug": "^2.2.0",
+            "fstream": "^1.0.10",
+            "fstream-ignore": "^1.0.5",
+            "once": "^1.3.3",
+            "readable-stream": "^2.1.4",
+            "rimraf": "^2.5.1",
+            "tar": "^2.2.1",
+            "uid-number": "^0.0.6"
          }
        },
        "tough-cookie": {
@@ -941,7 +941,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "punycode": "1.4.1"
+            "punycode": "^1.4.1"
          }
        },
        "tunnel-agent": {
@@ -949,7 +949,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "safe-buffer": "5.0.1"
+            "safe-buffer": "^5.0.1"
          }
        },
        "tweetnacl": {
@@ -984,7 +984,7 @@
          "bundled": true,
          "optional": true,
          "requires": {
-            "string-width": "1.0.2"
+            "string-width": "^1.0.2"
          }
        },
        "wrappy": {
@@ -999,8 +999,8 @@
      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
      "optional": true,
      "requires": {
-        "glob-parent": "2.0.0",
-        "is-glob": "2.0.1"
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
      }
    },
    "glob-parent": {
@@ -1008,7 +1008,7 @@
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
      "requires": {
-        "is-glob": "2.0.1"
+        "is-glob": "^2.0.0"
      }
    },
    "graceful-fs": {
@@ -1033,7 +1033,7 @@
      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
      "optional": true,
      "requires": {
-        "binary-extensions": "1.10.0"
+        "binary-extensions": "^1.0.0"
      }
    },
    "is-buffer": {
@@ -1053,7 +1053,7 @@
      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
      "optional": true,
      "requires": {
-        "is-primitive": "2.0.0"
+        "is-primitive": "^2.0.0"
      }
    },
    "is-extendable": {
@@ -1072,7 +1072,7 @@
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
      "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
      }
    },
    "is-glob": {
@@ -1080,7 +1080,7 @@
      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
      "requires": {
-        "is-extglob": "1.0.0"
+        "is-extglob": "^1.0.0"
      }
    },
    "is-number": {
@@ -1089,7 +1089,7 @@
      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
      "optional": true,
      "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
      }
    },
    "is-posix-bracket": {
@@ -1123,7 +1123,7 @@
      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
      "requires": {
-        "is-buffer": "1.1.5"
+        "is-buffer": "^1.1.5"
      }
    },
    "lcid": {
@@ -1131,7 +1131,7 @@
      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
      "requires": {
-        "invert-kv": "1.0.0"
+        "invert-kv": "^1.0.0"
      }
    },
    "micromatch": {
@@ -1140,19 +1140,19 @@
      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
      "optional": true,
      "requires": {
-        "arr-diff": "2.0.0",
-        "array-unique": "0.2.1",
-        "braces": "1.8.5",
-        "expand-brackets": "0.1.5",
-        "extglob": "0.3.2",
-        "filename-regex": "2.0.1",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1",
-        "kind-of": "3.2.2",
-        "normalize-path": "2.1.1",
-        "object.omit": "2.0.1",
-        "parse-glob": "3.0.4",
-        "regex-cache": "0.4.4"
+        "arr-diff": "^2.0.0",
+        "array-unique": "^0.2.1",
+        "braces": "^1.8.2",
+        "expand-brackets": "^0.1.4",
+        "extglob": "^0.3.1",
+        "filename-regex": "^2.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "normalize-path": "^2.0.1",
+        "object.omit": "^2.0.0",
+        "parse-glob": "^3.0.4",
+        "regex-cache": "^0.4.2"
      }
    },
    "minimatch": {
@@ -1161,7 +1161,7 @@
      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
      "optional": true,
      "requires": {
-        "brace-expansion": "1.1.8"
+        "brace-expansion": "^1.1.7"
      }
    },
    "moment": {
@@ -1174,7 +1174,7 @@
      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
      "integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
      "requires": {
-        "moment": "2.18.1"
+        "moment": ">= 2.9.0"
      }
    },
    "nan": {
@@ -1188,7 +1188,7 @@
      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
      "requires": {
-        "remove-trailing-separator": "1.1.0"
+        "remove-trailing-separator": "^1.0.1"
      }
    },
    "number-is-nan": {
@@ -1201,10 +1201,10 @@
      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.0.1.tgz",
      "integrity": "sha1-TedKPlULr2+jNwMj89HHwqhr3E0=",
      "requires": {
-        "a-sync-waterfall": "1.0.0",
-        "asap": "2.0.6",
-        "chokidar": "1.7.0",
-        "yargs": "3.32.0"
+        "a-sync-waterfall": "^1.0.0",
+        "asap": "^2.0.3",
+        "chokidar": "^1.6.0",
+        "yargs": "^3.32.0"
      }
    },
    "object.omit": {
@@ -1213,8 +1213,8 @@
      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
      "optional": true,
      "requires": {
-        "for-own": "0.1.5",
-        "is-extendable": "0.1.1"
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
      }
    },
    "os-locale": {
@@ -1222,7 +1222,7 @@
      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
      "requires": {
-        "lcid": "1.0.0"
+        "lcid": "^1.0.0"
      }
    },
    "parse-glob": {
@@ -1231,10 +1231,10 @@
      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
      "optional": true,
      "requires": {
-        "glob-base": "0.3.0",
-        "is-dotfile": "1.0.3",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1"
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
      }
    },
    "path-is-absolute": {
@@ -1261,8 +1261,8 @@
      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
      "optional": true,
      "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
      },
      "dependencies": {
        "is-number": {
@@ -1271,7 +1271,7 @@
          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
          "optional": true,
          "requires": {
-            "kind-of": "3.2.2"
+            "kind-of": "^3.0.2"
          },
          "dependencies": {
            "kind-of": {
@@ -1280,7 +1280,7 @@
              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
              "optional": true,
              "requires": {
-                "is-buffer": "1.1.5"
+                "is-buffer": "^1.1.5"
              }
            }
          }
@@ -1291,7 +1291,7 @@
          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
          "optional": true,
          "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "^1.1.5"
          }
        }
      }
@@ -1302,13 +1302,13 @@
      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
      "optional": true,
      "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~1.0.6",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.0.3",
+        "util-deprecate": "~1.0.1"
      }
    },
    "readdirp": {
@@ -1317,10 +1317,10 @@
      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
      "optional": true,
      "requires": {
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "readable-stream": "2.3.3",
-        "set-immediate-shim": "1.0.1"
+        "graceful-fs": "^4.1.2",
+        "minimatch": "^3.0.2",
+        "readable-stream": "^2.0.2",
+        "set-immediate-shim": "^1.0.1"
      }
    },
    "regex-cache": {
@@ -1329,7 +1329,7 @@
      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
      "optional": true,
      "requires": {
-        "is-equal-shallow": "0.1.3"
+        "is-equal-shallow": "^0.1.3"
      }
    },
    "remove-trailing-separator": {
@@ -1364,9 +1364,9 @@
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
      "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
      }
    },
    "string_decoder": {
@@ -1375,7 +1375,7 @@
      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
      "optional": true,
      "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "~5.1.0"
      }
    },
    "strip-ansi": {
@@ -1383,7 +1383,7 @@
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
      "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
      }
    },
    "util-deprecate": {
@@ -1407,8 +1407,8 @@
      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
      }
    },
    "y18n": {
@@ -1421,13 +1421,13 @@
      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
      "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
      "requires": {
-        "camelcase": "2.1.1",
-        "cliui": "3.2.0",
-        "decamelize": "1.2.0",
-        "os-locale": "1.4.0",
-        "string-width": "1.0.2",
-        "window-size": "0.1.4",
-        "y18n": "3.2.1"
+        "camelcase": "^2.0.1",
+        "cliui": "^3.0.3",
+        "decamelize": "^1.1.1",
+        "os-locale": "^1.4.0",
+        "string-width": "^1.0.1",
+        "window-size": "^0.1.4",
+        "y18n": "^3.2.0"
      }
    }
  }
--- a/vendor/yarn.lock
+++ b/vendor/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Michael Teeuw	6aa156d956	Merge pull request #1343 from MichMich/develop Release 2.4.1	2018-07-04 11:27:05 +02:00
Michael Teeuw	ef5ea93de1	Prepare for release 2.4.1	2018-07-04 11:20:37 +02:00
Michael Teeuw	b4913f51f2	Merge pull request #1341 from jannekalliola/master Fixed parsing date	2018-07-03 17:08:07 +02:00
Janne Kalliola	dc3e960e79	Fixed parsing date, as dt_txt is missing from certain weather API results	2018-07-02 23:22:09 +03:00
Michael Teeuw	1f76bd1942	Setup the next release (2.5.0).	2018-07-01 21:01:41 +02:00
Michael Teeuw	3545f80920	Merge pull request #1338 from MichMich/develop Release 2.4.0	2018-07-01 20:50:46 +02:00
Michael Teeuw	0b2d1564ef	Prepare to release 2.4.0	2018-07-01 20:43:04 +02:00
Michael Teeuw	fdacf824b3	Merge pull request #1337 from ShameerAshraf/develop Fixed Wind Chill and Heat Index for Kelvin	2018-06-30 21:03:19 +02:00
Shameer Ashraf	5c01a44644	Updated changelog	2018-06-29 13:27:55 -04:00
Shameer Ashraf	4eb49d872b	Updated changelog	2018-06-29 13:24:28 -04:00
Shameer Ashraf	34e5f29419	Fixed Wind Chill in Kelvin	2018-06-29 01:00:20 -04:00
Shameer Ashraf	f4910f0a8e	Fixed Heat Index for Kelvin	2018-06-29 00:23:04 -04:00
Michael Teeuw	c8c14611dc	Merge pull request #1334 from mdrayer/quick-fix-readme-raspberry-pi Correct the "Raspberry Pi" link in the ToC.	2018-06-27 20:22:30 +02:00
Michael Drayer	491201991e	Correct the "Raspberry Pi" link in the ToC.	2018-06-27 14:18:25 -04:00
Michael Teeuw	401f3574fd	Update CHANGELOG.md	2018-06-27 10:29:49 +02:00
Michael Teeuw	173a86172c	Add update translations.	2018-06-27 10:29:08 +02:00
Michael Teeuw	9ecbff024a	Update CHANGELOG.md	2018-06-27 10:26:30 +02:00
Michael Teeuw	1b5be34be4	Merge pull request #1333 from ubertao/fixlocale Fix locale id zh_cn -> zh-cn, zh_tw -> zh-tw, pt_br -> pt-br	2018-06-27 10:25:34 +02:00
Michael Teeuw	ceb3a997b6	Merge pull request #1330 from pintman/patch-1 minor typo in position fixed.	2018-06-27 10:23:15 +02:00
Ubertao	b1ead7fec8	Fix locale id zh_cn -> zh-cn, zh_tw -> zh-tw, pt_br -> pt-br	2018-06-27 14:09:02 +08:00
Michael Teeuw	d534dbb006	Merge pull request #1331 from flyingchipmunk/dev_newsfeed_logging Add option to newsfeed for logging errors	2018-06-27 02:39:14 +02:00
Matthew Veno	e56377117b	Add option to newsfeed for logging errors - 'logFeedWarnings' added to newsfeed config, defaulted to false - Only log parse feed errors when logFeedWarnings is true - Updated README and CHANGELOG - Fixes #1329	2018-06-26 20:01:28 -04:00
Marco Bakera	63483dc6c3	minor typo in position fixed.	2018-06-24 14:29:55 +02:00
Michael Teeuw	dd793650c3	Merge pull request #1314 from Ybbet/develop Customize classes for table.	2018-06-12 09:19:16 +02:00
Teddy Payet	afd829307d	Tabs and spaces from the original files With a diff, here the orginal tabulations.	2018-06-11 23:09:00 +02:00
Teddy Payet	09abdc0f12	ESLint format Resolve format ith eslint	2018-06-11 19:59:21 +02:00
Teddy Payet	ed4d17f578	README updated Update of README for the new option.	2018-06-11 16:41:08 +02:00
Teddy Payet	aeeeb5a37b	Add changelog	2018-06-11 14:04:06 +02:00
Teddy	dcb2e51587	Update .gitignore	2018-06-11 14:00:16 +02:00
Teddy Payet	cbc2eaf908	Customize classes for table MagicMirror offers helper classes in the main.css. Therefore, we give the possibility to indicate the class that we want.	2018-06-11 12:54:27 +02:00
Michael Teeuw	8808031e7c	Merge pull request #1309 from sdetweil/fix_suspend invoke callback for suspend notification, even if no dom content	2018-06-08 13:21:40 +02:00
Sam Detweiler	23ac7213d3	remove trailing spaces from reformatted else	2018-06-08 06:11:36 -05:00
Michael Teeuw	add7b44d0b	Style change.	2018-06-07 16:31:49 +02:00
Michael Teeuw	1e4b7599a7	Merge branch 'develop' into fix_suspend	2018-06-07 16:29:16 +02:00
Sam Detweiler	54443b038a	Revert "fix changelog" This reverts commit `c3f03e3f95`.	2018-06-07 08:09:39 -05:00
Sam Detweiler	c3f03e3f95	fix changelog	2018-06-07 08:04:49 -05:00
Sam Detweiler	18135624f6	update changelog	2018-06-07 08:02:16 -05:00
Sam Detweiler	11238d6b71	fix tabs	2018-06-07 07:59:07 -05:00
Sam Detweiler	848f94b1e0	invoke callback for suspend notification, even if no dom content	2018-06-07 07:50:42 -05:00
Michael Teeuw	d47cfe9504	Merge pull request #1304 from kjb085/kb/calendar-regex Add regex filtering to calendar module	2018-06-05 21:02:56 +02:00
Kenn Breece	70dccff293	Add regex filtering to calendar module	2018-06-03 21:12:31 -04:00
Michael Teeuw	e40873710b	Merge pull request #1302 from idoodler/develop Ability to fetch compliments from a remote server	2018-06-03 19:46:01 +02:00
idoodler	b140ef3b7a	Ability to fetch compliments from a remote server	2018-06-03 15:47:56 +02:00
Michael Teeuw	3b7b74aa67	Merge pull request #1297 from OiYouYeahYou/linting-fix Add and lint clientonly/index.js	2018-05-29 11:56:18 +02:00
Jason	de8e5b2d69	Merge branch 'develop' into linting-fix	2018-05-26 19:44:06 +01:00
Jason	afea33b0e3	Changelog	2018-05-26 19:42:58 +01:00
Jason	b44fbc1e4f	add and lint clientonly	2018-05-26 19:36:46 +01:00
Michael Teeuw	c4dee3dd8d	Merge pull request #1293 from derRAV3N/patch-1 Add note to README.md	2018-05-22 15:27:03 +02:00
derRAV3N	091e024032	Add note to README.md Add note to README.md to not add calendars that have entries before 1st January 1970.	2018-05-22 15:14:05 +02:00
Michael Teeuw	0e030f7f48	Add information about the Electron update.	2018-05-21 14:06:50 +02:00
Michael Teeuw	3049ba0b24	Merge pull request #1290 from edward-shen/develop newsfeed now remembers user configuration settings for descriptions after fullscreen view. Fixes #1282.	2018-05-16 07:27:38 +02:00
Edward Shen	55a161fafe	Fixes #1282 . Added a runtime var isShowingDescription that gets reset to user config. this.config.showDescription no longer mutates during runtime. Changelog has been updated to include this fix.	2018-05-15 20:37:45 -04:00
Michael Teeuw	349af24c81	Merge pull request #1287 from ringzer/patch-1 Update README.md	2018-05-12 12:33:25 +02:00
ringzer	788f1c4b3e	Update README.md Included /home/pi/MagicMirror/ path when copying config.js.sample and running npm run config:check	2018-05-11 16:47:03 +01:00
Michael Teeuw	889af461c6	Upgrade to Electron 2.0.0.	2018-05-11 16:23:43 +02:00
Michael Teeuw	df86e59089	Merge pull request #1284 from jrlambs/develop New calendar display format	2018-05-11 15:36:36 +02:00
=	c6bf69cce4	fix linting errors. add line to changelog	2018-05-10 19:54:01 -04:00
=	e492012004	fix missing s on timeFormat	2018-05-09 22:36:53 -04:00
=	94c46f9881	New calendar display format with date headers for days and times listed next to events for that date IE: Sunday, May 1st 2:00 pm Soccer 4:00 pm Basketball	2018-05-09 22:32:15 -04:00
Michael Teeuw	1eaa9d32ea	Merge pull request #1283 from jannekalliola/develop Changed weatherforecast to use dt_txt field	2018-05-09 09:35:49 +02:00
Janne Kalliola	0e2e8d2e2a	Changed weatherforecast to use dt_txt field	2018-05-08 18:45:38 +03:00
Michael Teeuw	cfb39c6364	Merge pull request #1279 from parnic/develop Fixed coloredSymbolOnly	2018-05-05 18:38:54 +02:00
Parnic	173499f496	Fixed coloredSymbolOnly	2018-05-05 08:31:58 -05:00
Michael Teeuw	1081049074	Merge pull request #1264 from parnic/develop Fixed heat index	2018-05-01 09:55:42 +02:00
Michael Teeuw	961dc85514	Merge pull request #1275 from john3300/colored-symbol-only Added option to calendar module that colors only the symbol	2018-05-01 09:55:13 +02:00
Michael Teeuw	6434acd492	Merge branch 'develop' into colored-symbol-only	2018-05-01 09:55:05 +02:00
Michael Teeuw	ccb27c89d8	Merge pull request #1262 from ndom91/patch-1 Updated newsfeed.js - improved fullscreen iframe	2018-05-01 09:53:56 +02:00
Brian Johnson	8053256203	Added option to calendar module that colors only the symbol instead of the whole line	2018-04-27 11:06:45 -05:00
Parnic	4abd7301fd	Updated changelog	2018-04-17 19:45:12 -05:00
Parnic	d6fe5ab417	Fixed heat index Celsius and Fahrenheit were flipped. The index was computed in Fahrenheit but used as if it were Celsius.	2018-04-17 19:43:09 -05:00
Nico Domino	a739fbdf1d	Update CHANGELOG.md	2018-04-17 00:39:05 +02:00
Nico Domino	c90a1ab6dc	Updated newsfeed.js - improved fullscreen iframe Had much better performance using 100vw (viewport width) than 100% (why - idk), but with 100% about 5% of my screen (1080x1920) to the right of the scroll bar was left black/blank, with 100vw I legitimately takes up the whole screen/viewport width. With the 10000 height the articles would always load about half way scrolled down. So I reduced the height and style.height to 3000. At my resolution at least, which I assume is fairly common, I had much better results. Unfortunately 3000 also isn't perfect - this still requires some tweaking. The article loads perfectly at the top of the iframe at 2500, but 2500 is much too small for most articles. 3000 seemed a good compromise, I could scroll far enoguh to read most articles on Reuters, and also load far enoguh up to read the beginning of the article. And finally I added a "scroll back up" button notification. This seems to work flawlessly.	2018-04-17 00:25:58 +02:00
Michael Teeuw	05ef68e079	Merge pull request #1258 from jannekalliola/develop Support for hiding on-going events	2018-04-08 18:14:39 +02:00
Michael Teeuw	dee4a7f3c7	Merge pull request #1257 from parnic/develop Fixed to work in Midori browser	2018-04-08 18:11:00 +02:00
Janne Kalliola	75753df0d8	Added description of on-going event hiding changes to the changelog	2018-04-08 15:07:20 +03:00
Janne Kalliola	30c5d78647	Support for hiding on-going events	2018-04-08 14:57:28 +03:00
Chris Pickett	6bb4db3842	Midori 0.4.3 support	2018-04-07 20:01:53 -05:00
Chris Pickett	cc0907fcd7	Updated changelog	2018-04-07 20:00:51 -05:00
Michael Teeuw	20b018bcc7	Merge pull request #1250 from bastilimbach/master Remove yarn-or-npm as it breaks production builds	2018-04-06 14:40:26 +02:00
Michael Teeuw	aafe2fa8d0	Update CHANGELOG.md	2018-04-06 14:39:41 +02:00
Michael Teeuw	ee7bd73b3f	Merge branch 'develop' into master	2018-04-06 14:39:04 +02:00
Michael Teeuw	b67f3bd629	Move change to 2.4.0 changelog.	2018-04-06 14:37:26 +02:00
Michael Teeuw	38b81e79f8	Merge pull request #1255 from wonjerry/develop Error in default/currentWeather	2018-04-06 14:35:19 +02:00
wonjerry	b73c549131	Error in MagicMirror/modules/default/currentWeather/currentWeather.js line 296, 300 Notice that self.config.animationSpeed can not be found because the notificationReceived function does not have "self" variable.	2018-04-06 21:25:10 +09:00
Michael Teeuw	d21d9f0141	Use Electron 2 Beta.	2018-04-06 13:21:53 +02:00
Michael Teeuw	7bb85032a1	Merge pull request #1252 from BerndKohl/feelslike-localisation enabling translation for "feelsLike" in current weather	2018-04-06 13:11:51 +02:00
Michael Teeuw	d90446ad28	Update CHANGELOG.md	2018-04-06 13:10:41 +02:00
Michael Teeuw	8b5e2f5528	Add dutch 'Feels' temperature.	2018-04-06 13:04:55 +02:00
Michael Teeuw	1bcc3ab7f1	Add default translation.	2018-04-06 13:04:04 +02:00
Michael Teeuw	3359c3cd45	Update currentweather.js	2018-04-06 13:03:06 +02:00
Michael Teeuw	af812f3c90	Fix translation file.	2018-04-06 13:02:27 +02:00
Michael Teeuw	1e6201093b	restore windChillInF variable.	2018-04-06 13:01:23 +02:00
BerndKohl	959ea69427	enabling translation for "feelsLike" in current weather enabled translation fixed typos in comments added German translation	2018-04-06 12:28:47 +02:00
Sebastian Limbach	cea744a914	Remove yarn-or-npm	2018-04-03 19:38:00 +02:00
Michael Teeuw	e8baf48764	Update CHANGELOG.md	2018-04-02 14:18:28 +02:00
Michael Teeuw	41242a2ae1	Merge pull request #1248 from E3V3A/patch-5 null check for notification removal	2018-04-02 14:17:25 +02:00
Michael Teeuw	f1dee488a7	Fix indent.	2018-04-02 14:11:21 +02:00
Michael Teeuw	3b4ff1818e	Update CHANGELOG.md	2018-04-02 14:03:16 +02:00
E:V:A	497145b1b5	null check for notification removal Make sure there is something to remove, before we attempt to remove the notifications. - This fixes #1240	2018-04-02 14:07:25 +03:00
Michael Teeuw	10eb41d319	FIx wind chill in Fahrenheit.	2018-04-02 12:58:19 +02:00
Michael Teeuw	4daf2e4a3d	Merge pull request #1246 from secuflag/develop Update italian translation	2018-04-01 19:44:24 +02:00
secuflag	f3266a5111	Update italian translation	2018-04-01 19:38:03 +02:00
Michael Teeuw	27cac4e8b8	Merge v2.3.1	2018-04-01 19:17:08 +02:00
Michael Teeuw	60b9a5b9da	Merge pull request #1245 from MichMich/electron-downgrade v2.3.1	2018-04-01 19:12:25 +02:00
Michael Teeuw	eaaa62a7f3	Downgrade Electron.	2018-04-01 19:05:38 +02:00
Michael Teeuw	6ce732ec3d	Preparation for v2.4.0.	2018-04-01 14:23:28 +02:00