fewieden 7a0bc81f48 Merge branch 'develop' of https://github.com/MichMich/MagicMirror into weather ...

# Conflicts:
#	css/main.css

2018-12-27 23:03:41 +01:00

..

alert

Classes for alert module

2018-08-01 09:37:27 +02:00

calendar

formatting corrected

2018-11-21 12:10:39 +01:00

clock

Added in screenshot

2018-10-07 15:12:10 -04:00

compliments

Fixed README formatting errors.

2018-10-08 19:40:54 -04:00

currentweather

Merge pull request #1426 from gberg927/develop

2018-10-26 15:12:34 +02:00

helloworld

Allow use of .njk extension for template files.

2017-10-18 13:49:03 +02:00

newsfeed

Initial

2018-12-10 14:02:50 -06:00

updatenotification

CHANGED: The UPDATE_INFO key in the localization file is changed to UPDATE_INFO_SINGLE and UPDATE_INFO_MULTIPLE to allow different localization for single and multiple commits.

2018-09-05 04:30:57 +02:00

weather

cleanup

2018-12-27 19:37:02 +01:00

weatherforecast

CHANGED: The Weather Forecast module by default displays the ° symbol after every numeric value to be consistent with the Current Weather module.

2018-12-14 11:32:58 +01:00

defaultmodules.js

A first setup of the new Weather Module

2017-09-21 16:38:18 +02:00