Ricardo Gonzalez ea70175a17 Merge branch 'develop' into feature/indoorHumidity ...

* develop: (71 commits)
  Update sample address
  set version of express-ipfilter:
  Describe default in comment of sample config
  More secure defaults.
  Fix grunt errors
  Weather forecast settings match current weather
  Fix JavaScript error in weatherforecast
  Update fr.json
  TestSuite: Show the missing strings for translations files.
  Update fr.json with added translations
  Added e2e test for font files
  Fix issue #986
  Fix extra tab file translations/zh_cn.json
  Add Changelog entry for new e2e test for helloworld module
  Small change for re-running Travis CI
  Change Two Conditionals to UpperCase-If
  Fix linting?
  Show Scale of Temperature if config flag is set
  Change to install Roboto fonts by npm
  Update stylelint package
  ...

# Conflicts:
#	CHANGELOG.md

2017-09-17 16:32:37 +01:00

..

alert

Added Dutch translation

2017-06-13 20:33:48 +02:00

calendar

Merge branch 'develop' into deprecation-warning

2017-08-13 04:28:06 -03:00

clock

Fix issue #933

2017-07-08 21:31:05 +02:00

compliments

Merge pull request #893 from xuanyou/xuanyou-patch-compliments-documentation

2017-05-18 12:35:42 +02:00

currentweather

Merge branch 'develop' into feature/indoorHumidity

2017-09-17 16:32:37 +01:00

helloworld

Change of examples configuration in README modules.

2017-01-24 17:22:17 -03:00

newsfeed

Updated documentation and fixed typos for the newsfeed module. Fixes GH-804

2017-03-30 21:15:51 +02:00

updatenotification

Fix for issue #950

2017-07-18 14:07:18 +02:00

weatherforecast

Fix grunt errors

2017-09-01 11:17:01 +02:00

defaultmodules.js

Add module 'updatenotification'.

2016-10-15 13:08:46 +02:00