Commit Graph

291 Commits

Author SHA1 Message Date
Michael Teeuw 555e01ec87 Merge branch 'develop' into develop 2017-02-08 19:32:53 +01:00
LAPTOP-KAUR\race2 90f60f95f7 formating fix so that grunt passes 2017-02-08 19:29:52 +02:00
LAPTOP-KAUR\race2 cbafaf5d56 compliments,js handles remoteFile without default daytimes defined 2017-02-08 02:35:09 +02:00
fewieden e69908abef fix indentation 2017-02-08 00:10:44 +01:00
fewieden 6cb3cf8747 fix indentation 2017-02-08 00:05:28 +01:00
fewieden 2f71a43420 dry pattern 2017-02-07 23:51:13 +01:00
Michael Teeuw e0f6fca987 Merge pull request #688 from Nosrac/develop
New Compliments category: `anytime`
2017-02-07 12:04:40 +01:00
Kyle Carson a2892ad097 Update Readme and changelog 2017-02-05 19:29:35 -06:00
Kyle Carson 79c79146a5 Support anytime compliment group. 2017-02-05 19:28:42 -06:00
fewieden 14b1b649cb bugfix 2017-02-06 01:19:03 +01:00
Michael Teeuw ce6cd6acdc Merge pull request #670 from roramirez/translation-check
Translation check
2017-01-31 08:44:10 +01:00
Kyle Carson 9f659eef1b Fix formatting 2017-01-30 16:35:21 -06:00
Kyle Carson 14cc642e54 Support calendar-specific maximumEntries and maximumNumberOfDays 2017-01-30 16:26:42 -06:00
Rodrigo Ramírez Norambuena 1032e97d58 Fix string russian translation module alert 2017-01-30 13:32:52 -03:00
Jeremias Arnstadt e249092f91 used mardown in calendar README 2017-01-29 11:17:00 +01:00
Jeremias Arnstadt 5c0b04bfc8 fixed linting issues 2017-01-29 00:59:38 +01:00
Jeremias Arnstadt bc257f4951 Merge branch 'develop' of https://github.com/artifactdev/MagicMirror
# Conflicts:
#	modules/default/calendar/README.md
#	modules/default/weatherforecast/README.md
2017-01-29 00:53:07 +01:00
Jeremias Arnstadt 4214293b76 updated README of weatherforecast and calendar module for color options 2017-01-28 18:32:06 +01:00
Jeremias Arnstadt ce3ee909bf added possibility to give each calendar another color 2017-01-28 18:21:02 +01:00
Jeremias Arnstadt 09ba1e2470 added possibility to color max and min temprature 2017-01-28 18:01:37 +01:00
Rodrigo Ramírez Norambuena 422349c2d1 Change of examples configuration in README modules.
This change is related commit f59f035a7e
Now is used  grunt for check ESLint syntax validation of config/* files
2017-01-24 17:22:17 -03:00
Zoltán Rónai 8181b9a31c Rename hu to hu.json
extension (**.json)
2017-01-24 09:09:13 +01:00
zoliaz1993 9670d74345 Update Hungarian language.
Add Alert module Hun translation.
Text aligned formality.
2017-01-24 08:54:39 +01:00
Joseph Bethge 63819c5757 fix calendar issues 2017-01-21 16:05:29 +01:00
Michael Teeuw a967e73f9e Merge branch 'develop' into fix_temperature_check 2017-01-19 20:03:13 +01:00
Tino Ziegler 222e4154a1 changed to double quotes 2017-01-19 09:11:33 +01:00
Tino Ziegler 93c07b2b1e Fix: check if temperature is defined (0°) 2017-01-18 15:56:12 +01:00
Brian 2913120ff7 Update README files 2017-01-17 16:14:50 +01:00
Michael Teeuw bd277b087a Merge pull request #624 from tosti007/Calendar_Regex
Add Regexp possibility to titleReplace
2017-01-17 11:07:42 +01:00
Brian c1a5f59c42 Remove Trailing space 2017-01-16 02:52:50 +01:00
Brian 49fb9108e9 Add Regexp possibility to titleReplace
Check if the given needle is a regexp, if so create one and use it
instead
2017-01-16 02:49:08 +01:00
Brian c95a37130a Remove unused uelf variable 2017-01-16 02:36:10 +01:00
Brian 29e82cc509 Fix Typo
Change E into R
2017-01-16 02:27:12 +01:00
Michael Teeuw a4cb53fdb4 Show correct units for showRainAmount 2017-01-15 21:16:01 +01:00
Michael Teeuw 1d02154d99 Fix eslint issues. 2017-01-15 19:41:42 +01:00
Michael Teeuw 949f7587dc Solve issue: #611 2017-01-15 19:38:46 +01:00
Michael Teeuw 2f7be0559a Switch to rrule-alt. Issue: #565 2017-01-14 19:31:24 +01:00
Michael Teeuw 5cbcded929 Merge branch 'develop' into russian_translations2 2017-01-12 19:42:50 +01:00
Thomas Bachmann 3ba16f1773 Merge remote-tracking branch 'MichMich/develop' 2017-01-11 11:32:20 +01:00
Thomas Bachmann c302030301 Added documentation on supported notifications and related third party modules 2017-01-11 11:19:33 +01:00
Thomas Bachmann 456502893c Addressed code review comments to reduce redundant lines 2017-01-08 14:38:16 +01:00
Thomas Bachmann 443a90c7ba Made full article view of news full-screen on any screen size 2017-01-07 22:42:11 +01:00
Thomas Bachmann b8a72245dc Using generic news feed events as notifications, instead of more implementation specific gestures from sensor 2017-01-06 21:57:30 +01:00
Sergey Morozov d019f88e26 Merge branch 'develop' into russian_translations2 2017-01-06 11:24:52 -08:00
Sergey Morozov 01cf4cc1ed Added Russian Translations
Redo of the PR #598

**Added:**
- Russian Translations

**Fixed:**
- corrected .gitignore rules for default modules

(Reasoning behind change: when I added translation for `alert` module `git add` was telling me that `.gitignore` rule excludes files and folders under `modules/default`)

I also noticed that `.gitignore:56` has following declaration:

```
!/modules/node_helper
!/modules/node_helper/**
```
but I don't think this directory structure exists today (also there is a small typo)
2017-01-06 11:21:20 -08:00
Thomas Bachmann 6251b77b28 Fixed code formatting issues 2017-01-04 11:01:07 +01:00
Thomas Bachmann adb8de9754 Enabled newsfeed default module for gesture events from https://github.com/thobach/MMM-Gestures 2017-01-04 10:46:31 +01:00
Ben Brosnahan a7619771a6 Add error handling to newsfeed 2017-01-02 21:35:53 +00:00
Michael Teeuw 09e6a6a4ad Merge branch 'master' into develop 2016-12-31 21:16:09 +01:00
Michael Teeuw 23bcac2e55 Merge pull request #585 from roramirez/extra-spaces
fix tabs, remove extra spaces and lines.
2016-12-31 19:12:24 +01:00