Michael Teeuw
ec20748594
Merge pull request #836 from roramirez/check-wrong-configuration
...
Check wrong configuration
2017-04-07 08:42:04 +02:00
Michael Teeuw
764f05b42a
Merge pull request #833 from javiersigler/task/improve_dockerfile
...
Docker - Do not replace configuration
2017-04-07 08:41:13 +02:00
Rodrigo Ramírez Norambuena
9725091233
Merge remote-tracking branch 'roramirez_github/develop' into check-wrong-configuration
2017-04-06 21:32:48 -03:00
Javier Sigler
8f8dfabe0f
Merge branch 'develop' of github.com:MichMich/MagicMirror into task/improve_dockerfile
2017-04-06 16:46:41 +02:00
Javier Sigler
b9749bad61
Do not replace configuration
2017-04-06 16:43:53 +02:00
Michael Teeuw
28e8cc2675
Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop
2017-04-06 16:30:38 +02:00
Michael Teeuw
033d3c92ab
Add missing dependency
2017-04-06 16:28:48 +02:00
Michael Teeuw
3484fcfd2a
Merge pull request #829 from roramirez/instruction_installer-develop
...
Instruction installer develop
2017-04-06 16:24:42 +02:00
Michael Teeuw
a8e18d7f99
Merge pull request #830 from roramirez/format-tab-config.sample
...
Fix extra tabs added in config.js.sample
2017-04-06 16:24:29 +02:00
Michael Teeuw
db30b58ee9
Merge pull request #828 from greg-dev/update-ru-week
...
Add Russian translation for week
2017-04-06 16:24:18 +02:00
Rodrigo Ramírez Norambuena
c53a20a577
Add changelog entry fix instruction_installer
2017-04-05 22:10:05 -03:00
Rodrigo Ramírez Norambuena
dfcb2b610a
Merge remote-tracking branch 'roramirez_github/develop' into instruction_installer
2017-04-05 22:01:01 -03:00
Greg Dev
95278a78ff
Add Russian translation for week
2017-04-05 23:39:39 +02:00
Michael Teeuw
400d577546
Merge pull request #825 from javiersigler/task/improve_dockerfile
...
Task/improve dockerfile
2017-04-05 20:14:46 +02:00
Michael Teeuw
60cf6cec5e
Merge pull request #822 from roramirez/website-package
...
Change website in package.json
2017-04-05 20:13:13 +02:00
Michael Teeuw
13901b9028
Merge pull request #821 from roramirez/newsfeed_test_case
...
Newsfeed test case
2017-04-05 20:12:57 +02:00
Michael Teeuw
23454a918d
Merge pull request #820 from roramirez/note-information-configuration-file
...
Add note about how configurate the file into config.js.sample
2017-04-05 20:12:37 +02:00
Javier Sigler
fa64ecf513
Remove layers and fix npm install of vendor
2017-04-04 18:34:19 +02:00
Javier Sigler
bb8c0f1d9c
Merge branch 'develop' of github.com:javiersigler/MagicMirror into task/improve_dockerfile
2017-04-04 18:32:22 +02:00
Javier Sigler
6e33e063da
Remove layers and fix npm install of vendor
2017-04-04 18:30:24 +02:00
Rodrigo Ramírez Norambuena
e44893f91e
Fix instruction README for install by script
...
issue close #823
2017-04-04 11:09:49 -03:00
Rodrigo Ramírez Norambuena
d903fe400f
Add entry in Changelog for newsfeed_test_case
2017-04-03 15:21:52 -03:00
Michael Teeuw
22e4e4125a
Merge pull request #818 from fewieden/fix-typo
...
fixed typo + eslint
2017-04-03 20:21:35 +02:00
Michael Teeuw
badddfe3d7
Merge pull request #817 from fewieden/german-translation
...
added german translation key
2017-04-03 20:20:59 +02:00
Michael Teeuw
e14816dcfa
Merge pull request #816 from roramirez/fix-spelling
...
Fix spelling mistake
2017-04-03 20:20:41 +02:00
Rodrigo Ramírez Norambuena
4b83722a66
Merge remote-tracking branch 'roramirez_github/develop' into newsfeed_test_case
2017-04-03 15:20:24 -03:00
Rodrigo Ramírez Norambuena
c798913fd2
Fix extra tabs added in config.js.sample
2017-04-03 15:18:35 -03:00
Rodrigo Ramírez Norambuena
636dbe5b95
Globing pattern test grunt ( #1 )
...
* Fix Matching patterns tests directories Grunt task of eslint
* Fix eslint errors in testsuite.
* Format one line per file in src section in Gruntfile.js
2017-04-03 16:47:22 +02:00
Rodrigo Ramírez Norambuena
ab28d0e09f
Add note about how configurate the file into config.js.sample
2017-04-03 11:28:46 -03:00
fewieden
a74efd285c
fix typo + eslint
2017-04-03 10:37:23 +02:00
fewieden
3e1eb03517
added german translation key
2017-04-03 10:06:57 +02:00
Michael Teeuw
fb90574d44
Update CHANGELOG.md
2017-04-02 23:10:32 +02:00
Michael Teeuw
c0fb337dfb
Merge pull request #815 from greg-dev/update-pl
...
Add Polish translation for week and day after tomorrow
2017-04-02 23:09:49 +02:00
Michael Teeuw
e7775bb9d9
Merge pull request #814 from amcolash/wrap_events
...
Option to wrap events in calendar
2017-04-02 23:09:11 +02:00
Greg Dev
64f2a67573
Add Polish translation for week and day after tomorrow
2017-04-02 22:29:54 +02:00
Andrew McOlash
154e33a2c3
Make times align to the top of the cell
2017-04-02 15:10:00 -05:00
Andrew McOlash
63ae2b8095
Add in ability to wrap calendar events to multiple lines
2017-04-02 15:06:58 -05:00
Michael Teeuw
6165a6af6c
Merge pull request #812 from doug-kline/patch-1
...
TL;RL cheat notes for IPv4 ipWhitelist when PI listening on IPv6
2017-04-02 09:07:51 +02:00
Doug Kline
4a70e3cd31
Update config.js.sample
2017-04-01 18:54:28 -04:00
Doug Kline
5ccf053cba
TL;RL cheat notes for IPv4 ipWhitelist
...
Hopefully save a google or support request -- while still using IPv4 addresses on MagicMirror network, need to set full address by using ::ffff: as prefix to IP in config. e.g. ::ffff:192.168.5.1 and not 192.168.5.1
2017-04-01 17:23:24 -04:00
Michael Teeuw
5a6f5133af
Prepare setup for 2.1.2
2017-04-01 22:05:21 +02:00
Michael Teeuw
1a2b4f8260
Merge pull request #811 from MichMich/develop
...
Release 2.1.1
2017-04-01 22:00:06 +02:00
Michael Teeuw
5436050df1
Prepare for release.
2017-04-01 21:49:52 +02:00
Michael Teeuw
d3f3946971
Merge pull request #810 from roramirez/vendor-fix-moment-timezone-script
...
Bugfix introduced into bb08fe8113e37a6a44dc3ab4ca64fcf8a3ec200e
2017-04-01 21:49:03 +02:00
Rodrigo Ramírez Norambuena
597a7f7b40
Bugfix introduced into bb08fe8113e37a6a44dc3ab4ca64fcf8a3ec200e
...
This is work on Pull Request #803 and help of @johanhammar and @fewieden
2017-04-01 15:53:20 -03:00
Michael Teeuw
02f549d1dd
Merge pull request #809 from roramirez/readme-timezone
...
Add link more information timezone information for configuracion in clock module
2017-04-01 11:15:52 +02:00
Michael Teeuw
0c096bb090
Merge pull request #806 from johanhammar/newsfeed-documentation-updates
...
Updated documentation and fixed typos for the newsfeed module
2017-03-31 09:29:04 +02:00
Michael Teeuw
8bc6cd7fc9
Merge pull request #799 from roramirez/missing-entries-changelog-test
...
Add in Changelog missing tests added for 2.1.1 version
2017-03-31 09:27:03 +02:00
Michael Teeuw
65d9e5d1fc
Merge pull request #800 from roramirez/test-set-MM_PORT
...
Test set mm port
2017-03-31 09:26:43 +02:00
Johan Hammar
47c356692f
Fix a few more typos
2017-03-30 22:14:11 +02:00
