Jannick Fahlbusch
07e28bfee6
Use HTTPS instead of HTTP
...
Chrome blocks insecure requests (HTTP) when MagicMirror is loaded
via HTTPS. This commit changes the protocol used for OpenWeatherMap.
2017-10-06 21:31:06 +02:00
Wolf-Gideon Bleek
4567fd1eb0
Merge branch 'develop' into master
2017-10-03 21:29:10 +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
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
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
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
29f3a81666
Fix weather forecast.
2017-09-29 10:04:42 +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
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
Rodrigo Ramírez Norambuena
58b763e935
Hack fix issue #1017
2017-09-12 10:31:49 -03:00
Chris van Marle
335ae0105f
Fix grunt errors
2017-09-01 11:17:01 +02:00
Chris van Marle
62ce7a0e37
Weather forecast settings match current weather
...
This change makes the config of weather forecast more in line with
current weather. It uses the configured units (metric, imperial,
default) to determine the sign.
2017-09-01 10:58:21 +02:00
Chris van Marle
afa0fb8da1
Fix JavaScript error in weatherforecast
...
Change 5568e0c2adc73aa20bebb5bfc47df65fea273b05 introduces JavaScript
errors, because it's calling toUpperCase() on a boolean value.
2017-09-01 10:38:25 +02:00
Michael Teeuw
daf76a311c
Merge pull request #991 from DanielWeeber/temperature-scale-show
...
Temperature scale show
2017-08-29 14:13:43 +02:00
DanielWeeber
2d2f159e04
Small change for re-running Travis CI
2017-08-16 12:11:57 +02:00
DanielWeeber
5568e0c2ad
Change Two Conditionals to UpperCase-If
2017-08-16 10:00:38 +02:00
DanielWeeber
cb2cc0cb9e
Fix linting?
2017-08-15 20:57:18 +02:00
DanielWeeber
5e573ca980
Show Scale of Temperature if config flag is set
2017-08-15 19:54:35 +02:00
Rodrigo Ramírez Norambuena
4bd36fc29e
Merge branch 'develop' into deprecation-warning
2017-08-13 04:28:06 -03:00
Michael Teeuw
c976242ce5
Merge branch 'develop' into unittests/calendar
2017-08-10 16:27:00 +02:00
Rodrigo Ramírez Norambuena
ea2f53e166
Merge remote-tracking branch 'upstream/develop' into doc-roundValue
2017-08-05 18:20:22 -04:00
Bas van Wetten
e0414e4eb9
Add unittest for calendar module
...
Add unittest for 'getLocalSpecification' function.
2017-07-31 22:36:14 +02:00
Michael Teeuw
18b61e35be
Merge branch 'develop' into unittest-calendar
2017-07-31 15:04:16 +02:00
Rodrigo Ramírez Norambuena
06af327e5e
Added deprecation warning for authentication of the calendar module.
...
Discussed in Review
9848f80630 (r105531731)
2017-07-30 22:56:27 -04:00
Bas van Wetten
35e3b889c3
Add new unit tests
...
Add new unit tests for 'shorten' function in calendar module
2017-07-29 16:02:53 +02:00
Bas van Wetten
b89ee67daf
Merge branch 'fix-issue-961' into fix-issue-963
2017-07-28 21:33:10 +02:00
Bas van Wetten
7bd256c311
Fix calendar.js bug issue #963
...
Fixed calendar specific configuration settings maximumEntries and maximumNumberOfDays not overriding global setting
2017-07-28 21:07:38 +02:00
Bas van Wetten
4add7cd0b3
Fix calendar.js bug
...
Fix bug where excludedEvents count towards maximumEntries displayed
2017-07-28 17:47:22 +02:00
Ricardo Gonzalez
2c6ecaab5b
Add ability for currentweather module to display indoor humidity via INDOOR_HUMIDITY notification
2017-07-23 23:55:32 +01:00
Unknown
a7297d2685
Fix for issue #950
...
Changed 'server.js' to allow an empty ipwhitelist to allow any and all hosts instead of none as mentioned in the documentation
2017-07-18 14:07:18 +02:00
Michael Teeuw
c492ea77f1
Merge pull request #943 from QNimbus/fix-issue-940
...
Fix issue #940
2017-07-12 10:55:43 +02:00
Michael Teeuw
61d9112ba7
Merge pull request #941 from QNimbus/fix-issue-933
...
Fix issue #933
2017-07-12 10:55:23 +02:00
Unknown
db0bd3fa2d
Fix issue #940
...
Fix for issue 940 - time was incorrectly displayed in a 12-hour fashion regardless of the 24 hour clock preference in config.js
2017-07-09 11:46:59 +02:00
Unknown
551619e772
Fix issue #933
...
This is a fix for issue 933 which restores the original alligment of the analog clock; the analog clock still does not properly align to the left of the left sidebar when content of other left sidebar modules is too wide.
2017-07-08 21:31:05 +02:00
eouia
561ae102fb
add symbol and color on broadcasted events
2017-07-06 11:57:16 +02:00
Michael Teeuw
8fb7e79bb3
Merge branch 'develop' into calendar-timeformat-pr
2017-06-29 09:26:18 +02:00
Unknown
c15148fc07
Issue with date aligment in clock.js
...
In reference to issue #927 . Made changes to clock.js and clock_styles.css to prevent aligment problem when displaying analog clock and large calendar entries
2017-06-26 20:19:13 +02:00
Unknown
3404ebbbb8
Calender respects timeformat
...
In reference to issue #776 , made changes to calendar.js to respect timeformat config option if it is used
2017-06-26 14:43:40 +02:00
Unknown
9416980096
Added Dutch translation
...
Added Dutch translation to Alert module
2017-06-13 20:33:48 +02:00
Veeck
96c338859b
More lazy sunday cleanups of missing semicolons, unused vars and other small thins
2017-06-11 11:53:55 +02:00
Veeck
20687d915a
Remove unused vars and whitelines, cleanups
2017-06-02 19:35:10 +02:00
Michael Teeuw
3c82dfc0a5
Merge pull request #897 from roramirez/information-Beaufort-function
...
Add link for information about Beaufort Wind Scale for ms2Beaufort
2017-05-26 14:40:47 +02:00
Michael Teeuw
0db40bbb32
Merge pull request #893 from xuanyou/xuanyou-patch-compliments-documentation
...
Xuanyou patch compliments documentation
2017-05-18 12:35:42 +02:00
xuanyou
cbb6e4d6f3
Update docs: classes config variable default value
2017-05-18 18:25:17 +08:00
xuanyou
34361ccd1c
Update documentation for compliments module
...
Added documentation for the config variable "classes" that allows the user to override the css classes of the compliments module display.
Fixed the erroneous "a default calendar is shown" to "default compliments".
2017-05-18 18:14:43 +08:00
retroflex
7c80eec755
Merge branch 'develop' into develop
2017-05-02 21:24:36 +02:00
