Michael Teeuw
4aec39df7a
Fix Merge Conflicts.
2017-03-17 14:32:01 +01:00
Michael Teeuw
15b19925f2
Fix Merge
2017-03-17 14:16:35 +01:00
Michael Teeuw
bfb376505b
Merge pull request #759 from roramirez/readme-ipWhitelist
...
Add note to allow all IP addresses. ipWhitelist configuration directive.
2017-03-17 14:10:24 +01:00
Michael Teeuw
28eb0be4ad
Merge pull request #769 from amcolash/single_line_news
...
Add in single line news items
2017-03-17 13:27:13 +01:00
Andrew McOlash
d3fd9a188d
Merge branch 'develop' into single_line_news
2017-03-17 07:18:13 -05:00
Andrew McOlash
41a15f90cb
Merge remote-tracking branch 'upstream/develop' into single_line_news
2017-03-17 07:17:19 -05:00
Michael Teeuw
9c604a7886
Merge pull request #773 from amcolash/degree_label
2017-03-17 13:12:49 +01:00
Andrew McOlash
8ad1d6fd97
Merge branch 'develop' into degree_label
2017-03-17 07:12:15 -05:00
Andrew McOlash
a18e7eb089
Fix conflict with CHANGELOG, merge with upstream/develop
2017-03-17 07:08:00 -05:00
BeatIdo
1f5ea40bf6
News Feed hideLoading option
2017-03-17 09:08:45 +01:00
BeatIdo
44509e027c
Add hideLoading option description
2017-03-17 09:06:29 +01:00
Michael Teeuw
fe3758b1bb
Merge pull request #768 from roramirez/test-auth-calendar
...
Test auth calendar
2017-03-17 08:59:04 +01:00
Michael Teeuw
ebe2a30463
Merge pull request #754 from deg0nz/develop
...
Add support for more authentication methods for the default calendar module
2017-03-17 08:58:37 +01:00
Michael Teeuw
1216a26d13
Merge pull request #766 from BeatIdo/patch-1
...
Complete OWM city list URL
2017-03-17 08:55:52 +01:00
Michael Teeuw
65800853f4
Merge pull request #765 from roramirez/test-ipWhitelist
...
Add test without access by ipWhistelist
2017-03-17 08:55:15 +01:00
Andrew McOlash
e2099f0749
Fix indents
2017-03-13 06:27:54 -05:00
Andrew McOlash
3c60feed02
Add in degree label to solve issue #753
2017-03-13 06:24:04 -05:00
Andrew McOlash
a5dc3cd018
Update CHANGELOG to reflect updates to the codebase
2017-03-11 17:40:24 -06:00
Andrew McOlash
afe0e3c1d6
Add in option to have single line news
2017-03-11 17:36:47 -06:00
Beh
91e1f958f2
Removed Calendar.zip
2017-03-11 12:24:17 +01:00
Rodrigo Ramírez Norambuena
1bdc46969c
Add information message when the ipWhitelist is configurate with []
2017-03-10 16:36:17 -03:00
Rodrigo Ramírez Norambuena
989ee0e281
Add link for tutorial ipWhitelist HowTo of @mochman
2017-03-10 16:27:05 -03:00
BeatIdo
0f27d646bb
removed trailing spaces
2017-03-10 17:03:14 +01:00
BeatIdo
81aca500b3
Hide News Feed loading option
...
Configuration option to hide News Feed module if feed is empty instead of showing LOADING status
2017-03-10 16:56:28 +01:00
BeatIdo
50f2dded64
Complete OWM city list URL
2017-03-10 16:42:43 +01:00
Michael Teeuw
d26d94b62a
Merge pull request #760 from roramirez/readme-tab-fix
...
Fix tab documentacion calendar for colored option
2017-03-10 14:59:22 +01:00
Michael Teeuw
2811f76714
Merge pull request #758 from CatoAntonsen/nn_translation
...
Updated Norwegian translations (nn and nb)
2017-03-10 14:57:09 +01:00
Michael Teeuw
67b21ad766
Merge pull request #757 from slametps/develop
...
indonesian translation
2017-03-10 14:56:43 +01:00
Michael Teeuw
6d07d5dccb
Merge pull request #751 from roramirez/callback-fail-load-config
...
Use just one callback statement in case of failure on configuration loader
2017-03-10 14:53:36 +01:00
Michael Teeuw
da0e3d5c8b
Merge pull request #750 from CatoAntonsen/animation_fix
...
Fixed missing animations on this.show() when module is alone in a region
2017-03-10 14:53:16 +01:00
Rodrigo Ramírez Norambuena
b129fe908c
Test check backward backward compatibility authentication method basic
...
on calendar module
Fix travis basic-auth server
2017-03-10 04:47:57 -03:00
Rodrigo Ramírez Norambuena
f5c57e84c7
Add test calendar without auth method. Should be set by default basic.
2017-03-10 04:36:09 -03:00
Rodrigo Ramírez Norambuena
ceb4ef2642
Add test basic-auth
2017-03-10 04:33:27 -03:00
Rodrigo Ramírez Norambuena
1c235aa761
Add test default calendar
2017-03-10 04:31:26 -03:00
Rodrigo Ramírez Norambuena
34f04b1946
Add note to allow all IP addresses. ipWhitelist configuration directive.
2017-03-09 17:26:50 -03:00
Slamet PS
db10226005
update spaces to tab
2017-03-08 10:37:27 +07:00
Rodrigo Ramírez Norambuena
a15b8077a3
Add test without access by ipWhistelist
...
This test set a invalid IP address for not have access to MagicMirror.
Creates a request to localhost and port added in configuration and check if
gets 403 HTTP code.
2017-03-07 19:50:19 -03:00
Cato Antonsen
a3836b5e17
Updated Norwegian translations (nn and nb)
2017-03-07 18:06:26 +01:00
Beh
f8d80422b2
Fixed Travis CI errors
...
Changed indentation from spaces to tabs
changed strings from single quote to double quote
2017-03-07 00:34:17 +01:00
Beh
9848f80630
Added support for more authentication methods for the default calendar module
...
HTTP Basic, Digest and OAuth2/Bearer authentications are now supported
by the calendar module
2017-03-07 00:12:43 +01:00
Michael Teeuw
6ea1732630
Merge pull request #749 from peet86/develop
...
Small fixes in the Hungarian translation
2017-03-06 15:07:29 +01:00
Rodrigo Ramírez Norambuena
d97571ce0c
Fix tab documentacion calendar for colored option
2017-03-06 02:11:27 -03:00
Rodrigo Ramírez Norambuena
2168838365
Use just one callback statement in case of failure on loader of the
...
configuration file.
2017-03-05 22:05:54 -03:00
Cato Antonsen
219021873d
Removed trailing space
2017-03-05 23:42:13 +01:00
Cato Antonsen
120b505361
Implemented another way of waiting for refresh of region before animation
2017-03-05 23:36:24 +01:00
Cato Antonsen
347a2977fa
Removed trailing spaces
2017-03-05 22:46:48 +01:00
Cato Antonsen
c2e90864ac
Fixed missing animations on this.show() when module is alone in a region
2017-03-05 22:23:05 +01:00
Peter Varga
1027efd6e5
small fixes in hu translation
2017-03-05 19:50:48 +01:00
Michael Teeuw
bd0de83d31
Merge pull request #745 from roramirez/mv-colors-utils
...
Move colors in utils file
2017-03-05 17:16:16 +01:00
Michael Teeuw
4d3523b677
Merge pull request #746 from roramirez/json-format-config-pm2
...
Use JSON format for configuration file on pm2 control process file
2017-03-05 17:15:56 +01:00
