diff --git a/CHANGELOG.md b/CHANGELOG.md index a2db6496..a2285c74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add option to display temperature unit label to the current weather module - Added ability to disable wrapping of news items - Added in the ability to hide events in the calendar module based on simple string filters. +- Updated Norwegian translation. +- Added hideLoading option for News Feed module +- Added configurable dateFormat to clock module. ### Fixed - Update .gitignore to not ignore default modules folder. diff --git a/README.md b/README.md index 9cadb364..98ca4154 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ The following properties can be configured: | --- | --- | | `port` | The port on which the MagicMirror² server will run on. The default value is `8080`. | | `address` | The ip address the accept connections. The default open bind `::` is IPv6 is available or `0.0.0.0` IPv4 run on. Example config: `192.168.10.100`. | -| `ipWhitelist` | The list of IPs from which you are allowed to access the MagicMirror². The default value is `["127.0.0.1", "::ffff:127.0.0.1", "::1"]`. It is possible to specify IPs with subnet masks (`["127.0.0.1", "127.0.0.1/24"]`) or define ip ranges (`["127.0.0.1", ["192.168.0.1", "192.168.0.100"]]`).| +| `ipWhitelist` | The list of IPs from which you are allowed to access the MagicMirror². The default value is `["127.0.0.1", "::ffff:127.0.0.1", "::1"]`. It is possible to specify IPs with subnet masks (`["127.0.0.1", "127.0.0.1/24"]`) or define ip ranges (`["127.0.0.1", ["192.168.0.1", "192.168.0.100"]]`). Set `[]` to allow all IP addresses. For more information about how configure this directive see the [follow post ipWhitelist HowTo](https://forum.magicmirror.builders/topic/1326/ipwhitelist-howto) | | `zoom` | This allows to scale the mirror contents with a given zoom factor. The default value is `1.0`| | `language` | The language of the interface. (Note: Not all elements will be localized.) Possible values are `en`, `nl`, `ru`, `fr`, etc., but the default value is `en`. | | `timeFormat` | The form of time notation that will be used. Possible values are `12` or `24`. The default is `24`. | diff --git a/config/config.js.sample b/config/config.js.sample index d50b6428..53677cfa 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -6,7 +6,7 @@ var config = { port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses. language: "en", timeFormat: 24, diff --git a/js/server.js b/js/server.js index 901e0350..beb8b84c 100644 --- a/js/server.js +++ b/js/server.js @@ -19,6 +19,10 @@ var Server = function(config, callback) { server.listen(config.port, config.address ? config.address : null); + if (config.ipWhitelist instanceof Array && config.ipWhitelist.length == 0) { + console.info("You're using a full whitelist configuration to allow for all IPs") + } + app.use(function(req, res, next) { var result = ipfilter(config.ipWhitelist, {mode: "allow", log: false})(req, res, function(err) { if (err === undefined) { diff --git a/modules/default/clock/README.md b/modules/default/clock/README.md index 5570ff5a..f518a2b2 100644 --- a/modules/default/clock/README.md +++ b/modules/default/clock/README.md @@ -30,6 +30,7 @@ The following properties can be configured: | `showPeriodUpper` | Show the period (AM/PM) with 12 hour format as uppercase.

**Possible values:** `true` or `false`
**Default value:** `false` | `clockBold` | Remove the colon and bold the minutes to make a more modern look.

**Possible values:** `true` or `false`
**Default value:** `false` | `showDate` | Turn off or on the Date section.

**Possible values:** `true` or `false`
**Default value:** `true` +| `dateFormat` | Configure the date format as you like.

**Possible values:** [Docs](http://momentjs.com/docs/#/displaying/format/)
**Default value:** `"dddd, LL"` | `displayType` | Display a digital clock, analog clock, or both together.

**Possible values:** `digital`, `analog`, or `both`
**Default value:** `digital` | `analogSize` | **Specific to the analog clock.** Defines how large the analog display is.

**Possible values:** A positive number of pixels`
**Default value:** `200px` | `analogFace` | **Specific to the analog clock.** Specifies which clock face to use.

**Possible values:** `simple` for a simple border, `none` for no face or border, or `face-###` (where ### is currently a value between 001 and 012, inclusive)
**Default value:** `simple` diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js index e15fbbbd..21e665e7 100644 --- a/modules/default/clock/clock.js +++ b/modules/default/clock/clock.js @@ -16,6 +16,7 @@ Module.register("clock",{ showPeriodUpper: false, clockBold: false, showDate: true, + dateFormat: "dddd, LL", /* specific to the analog clock */ analogSize: "200px", @@ -87,7 +88,7 @@ Module.register("clock",{ } if(this.config.showDate){ - dateWrapper.innerHTML = now.format("dddd, LL"); + dateWrapper.innerHTML = now.format(this.config.dateFormat); } timeWrapper.innerHTML = timeString; secondsWrapper.innerHTML = now.format("ss"); diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md index 7758bb10..9f7b2e7d 100644 --- a/modules/default/newsfeed/README.md +++ b/modules/default/newsfeed/README.md @@ -65,6 +65,7 @@ The following properties can be configured: | `showDescription` | Display the description of an item.

**Possible values:** `true` or `false`
**Default value:** `false` | `wrapTitle` | Wrap the title of the item to multiple lines.

**Possible values:** `true` or `false`
**Default value:** `true` | `wrapDescription` | Wrap the description of the item to multiple lines.

**Possible values:** `true` or `false`
**Default value:** `true` +| `hideLoading` | Hide module instead of showing LOADING status.

**Possible values:** `true` or `false`
**Default value:** `false` | `reloadInterval` | How often does the content needs to be fetched? (Milliseconds)

**Possible values:** `1000` - `86400000`
**Default value:** `300000` (5 minutes) | `updateInterval` | How often do you want to display a new headline? (Milliseconds)

**Possible values:**`1000` - `60000`
**Default value:** `10000` (10 seconds) | `animationSpeed` | Speed of the update animation. (Milliseconds)

**Possible values:**`0` - `5000`
**Default value:** `2500` (2.5 seconds) diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index 738b3130..5094355e 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -23,6 +23,7 @@ Module.register("newsfeed",{ showDescription: false, wrapTitle: true, wrapDescription: true, + hideLoading: false, reloadInterval: 5 * 60 * 1000, // every 5 minutes updateInterval: 10 * 1000, animationSpeed: 2.5 * 1000, @@ -182,11 +183,17 @@ Module.register("newsfeed",{ wrapper.appendChild(fullArticle); } - + if (this.config.hideLoading) { + this.show(); + } } else { - wrapper.innerHTML = this.translate("LOADING"); - wrapper.className = "small dimmed"; + if (this.config.hideLoading) { + this.hide(); + } else { + wrapper.innerHTML = this.translate("LOADING"); + wrapper.className = "small dimmed"; + } } return wrapper;