Michael Teeuw
980b017fbe
Merge pull request #1046 from wbleek/master
...
moved weekNumber into field and adjusted language handling accordingly [issue #910 ]
2017-10-03 22:13:21 +02:00
Wolf-Gideon Bleek
4567fd1eb0
Merge branch 'develop' into master
2017-10-03 21:29:10 +02:00
Wolf-Gideon Bleek
8c150c23f3
moved weekNumber into field and adjusted language handling accordingly [issue #910 ]
2017-10-03 21:25:30 +02:00
Wolf-Gideon Bleek
b4fd570269
moved weekNumber into field and adjusted language handling accordingly [issue #910 ]
2017-10-03 21:18:25 +02:00
Michael Teeuw
6e051d73c1
Merge pull request #1044 from cederstrom/honor-calendar-maximum-entries
...
Slice the list of all calendar events to honor config.maximumEntries
2017-10-01 21:51:33 +02:00
Michael Teeuw
e381e1a313
Merge pull request #1042 from roramirez/readme-localhost-bind
...
Updated readme about default value for `address` configuration
2017-10-01 21:49:47 +02:00
Andreas Cederström
2d03ff63cf
Slice the list of all events to honor config.maximumEntries
...
Scenario:
* Specify more than one calendar in `config.calendars`
* Specify a maximum number of entries in `config.maximumEntries`
Result:
The module will show as many as maximumEntries for EACH calendar
Expected:
The module shall not show more than a total of maximumEntries, regardless of how many calendars I specify
Fixes #1043
2017-10-01 21:47:10 +02:00
Rodrigo Ramírez Norambuena
309de631ed
Updated readme about default value for address configuration changed it
...
in https://github.com/MichMich/MagicMirror/commit/2f05228d
2017-10-01 15:01:34 -03:00
Michael Teeuw
bad7316b80
Allow html tags in text string.
2017-10-01 13:22:29 +02:00
Michael Teeuw
4757c36233
Updated changelog and minor fix example
2017-10-01 13:16:07 +02:00
Michael Teeuw
9ca6180207
Merge branch 'templates' into develop
2017-10-01 13:10:25 +02:00
Michael Teeuw
30179ad977
Setup of new dev release.
2017-10-01 12:39:48 +02:00
Michael Teeuw
b799609749
Merge pull request #1039 from MichMich/develop
...
Release 2.1.3
2017-10-01 12:36:53 +02:00
Michael Teeuw
efb6994ae7
Changes in preparation of 2.1.3
2017-10-01 12:34:54 +02:00
Michael Teeuw
880a977dd6
Merge pull request #1038 from roramirez/templates-fixes
...
This fix the follow things:
2017-09-30 13:39:00 +02:00
Michael Teeuw
6eceffb403
Merge pull request #1037 from roramirez/lint-fix
...
Little lint fix
2017-09-30 13:36:38 +02:00
Rodrigo Ramírez Norambuena
795e33881c
This fix the follow things:
...
* The default screen on missing configuration file and syntax error.
* Tests
2017-09-29 19:10:03 -03:00
Rodrigo Ramírez Norambuena
d310c3857f
Little lint fix
2017-09-29 18:33:17 -03:00
Michael Teeuw
8c53908cc4
Update CHANGELOG.md
2017-09-29 13:37:24 +02:00
Michael Teeuw
589b54984a
Add slack badge.
2017-09-29 13:36:44 +02:00
Michael Teeuw
3f30ed5251
Add info about weather forecast.
2017-09-29 13:01:08 +02:00
Michael Teeuw
3f9181905a
Fix typo's.
2017-09-29 11:05:59 +02:00
Michael Teeuw
29f3a81666
Fix weather forecast.
2017-09-29 10:04:42 +02:00
Michael Teeuw
5efc43260e
Switch to async rendering.
2017-09-28 16:43:38 +02:00
Michael Teeuw
e01794a07f
First Nunchucks Implementation.
2017-09-28 16:11:25 +02:00
Michael Teeuw
5fde095a6f
Merge pull request #1024 from roramirez/openweathermap-forescast
...
Hack fix issue #1017
2017-09-28 14:44:13 +02:00
Michael Teeuw
3237af2d85
Add translation: Welsh (Cymraeg)
2017-09-28 14:42:21 +02:00
Michael Teeuw
953b666ebd
Update translations.js
2017-09-28 14:41:30 +02:00
Michael Teeuw
417bb4bf37
Merge pull request #1022 from meigwilym/meigwilym-welsh-lang
...
Welsh (Cymraeg) language file
2017-09-28 14:39:26 +02:00
Michael Teeuw
a55213d88a
Merge pull request #1019 from EdgardosReis/develop
...
Updated pt.json translation
2017-09-28 14:38:55 +02:00
Michael Teeuw
ec84d190f4
Remove newline.
2017-09-28 14:38:39 +02:00
Michael Teeuw
1b0bad72de
Remove newline.
2017-09-28 14:38:08 +02:00
Michael Teeuw
931055708d
Merge pull request #1033 from roramirez/one-instance-all-module-position-spec
...
Refactor modules_position_spec use one instance for all it statements
2017-09-26 08:56:06 +02:00
Rodrigo Ramírez Norambuena
15fd570b49
Refactor modules_position_spec use one instance for all it statements
2017-09-25 20:52:27 -03:00
Michael Teeuw
5e51a438a7
Merge pull request #1025 from ryck/feature/indoorHumidity
...
Feature/indoor humidity
2017-09-20 15:19:53 +02:00
Ricardo Gonzalez
7f768059e6
Update README
2017-09-17 16:33:23 +01:00
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
Ricardo Gonzalez
74a736691a
Merge remote-tracking branch 'upstream/develop' into develop
...
* upstream/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
...
2017-09-17 16:31:27 +01:00
Mei Gwilym
86ff44adfc
Welsh (Cymraeg) language file
2017-09-13 22:17:07 +01:00
Rodrigo Ramírez Norambuena
58b763e935
Hack fix issue #1017
2017-09-12 10:31:49 -03:00
EdgardosReis
5c90cc59aa
Updated pt.json translation
2017-09-10 21:42:01 +01:00
Michael Teeuw
710ab44073
Merge pull request #1014 from roramirez/tests/unit/weatherforecast
...
Add roundValue unit test function weatherforecast module:
2017-09-07 10:07:28 +02:00
Michael Teeuw
b28c5e6807
Merge pull request #1015 from roramirez/show-missing-string-test-translations
...
TestSuite: Show the missing strings for translations files.
2017-09-07 10:07:09 +02:00
Michael Teeuw
e5ead9ed44
Merge pull request #1004 from qistoph/issue950
...
More secure defaults.
2017-09-06 15:25:04 +02:00
Chris van Marle
d99897cf9d
Update sample address
...
As proposed in review
2017-09-06 15:22:17 +02:00
Michael Teeuw
701a7cae02
Merge pull request #1011 from qistoph/fix_on_991
...
Fix on 991
2017-09-06 14:40:32 +02:00
Michael Teeuw
068b6a5470
Merge pull request #1012 from roramirez/set-version-express-ipfilter
...
set version of express-ipfilter:
2017-09-06 14:19:30 +02:00
Rodrigo Ramírez Norambuena
45d597ac49
set version of express-ipfilter:
...
Prevent problems with ipWhitelist using []
Information in https://forum.magicmirror.builders/topic/4716/issue-with-white-list-ip-s-not-working/14
4adc5dc33e
2017-09-05 23:56:32 -03:00
Chris van Marle
a518d3f33f
Describe default in comment of sample config
2017-09-01 14:46:25 +02:00
Chris van Marle
2f05228d91
More secure defaults.
...
Without config, listen only on looback interface. In sample config
listen on any interface, but use an IP whitelist.
Related to #950
2017-09-01 14:46:25 +02:00
