Michael Teeuw
b05534472c
Merge pull request #862 from roramirez/dev-args
...
Change method for check if pass dev parameter
2017-04-22 18:57:12 +02:00
Michael Teeuw
30aa8d469c
Merge pull request #861 from roramirez/unit-calendar
...
Unit calendar
2017-04-22 18:56:55 +02:00
Michael Teeuw
efb592dce5
Merge pull request #856 from bastilimbach/develop
...
Outsource Dockerfiles
2017-04-19 21:45:42 +02:00
Michael Teeuw
fa5b936d7b
Merge pull request #858 from roramirez/check-week-number
...
Check week number
2017-04-19 21:45:23 +02:00
Rodrigo Ramírez Norambuena
4904bd53ef
Fix grunt double quotes unit calendar_spec
2017-04-19 00:45:55 -03:00
Rodrigo Ramírez Norambuena
320ce372f5
Add changelog unit test capFirst function on calendar module
2017-04-19 00:39:18 -03:00
Rodrigo Ramírez Norambuena
7a803abec8
Merge remote-tracking branch 'roramirez_github/develop' into unit-calendar
2017-04-19 00:38:35 -03:00
Rodrigo Ramírez Norambuena
b41bda569d
Change method for check if pass dev parameter
2017-04-18 23:34:14 -03:00
Rodrigo Ramírez Norambuena
dce8edf742
Merge branch 'develop' into check-week-number
2017-04-18 22:59:07 -03:00
Rodrigo Ramírez Norambuena
298e32aada
Fix Grunt error
...
124:38 error Strings must use doublequote quotes
2017-04-18 22:38:29 -03:00
Michael Teeuw
a3d4049c9c
Merge pull request #848 from MichMich/master
...
Unable to install dependencies!
2017-04-17 10:59:43 +02:00
Sebastian Limbach
058b4bbe6c
Add changes to changelog
2017-04-16 22:48:05 +02:00
Michael Teeuw
c4c7b2ed5b
Merge pull request #853 from roramirez/gitignore-vim
...
ignore git file for vim and patch
2017-04-16 22:27:14 +02:00
Michael Teeuw
aee607ea81
Merge pull request #852 from roramirez/sort-dependencies
...
Sort dependencies in the file package.json
2017-04-16 22:27:02 +02:00
Michael Teeuw
5eea5939c0
Merge pull request #850 from roramirez/defaultModules-set
...
Default modules set
2017-04-16 22:26:42 +02:00
Sebastian Limbach
ac53d64ffc
Change docker hub url
2017-04-16 21:17:52 +02:00
Sebastian Limbach
9ebee8c03e
Delete all Docker related files
...
The Docker images are outsourced to https://github.com/bastilimbach/docker-MagicMirror
2017-04-16 21:17:07 +02:00
Rodrigo Ramírez Norambuena
93965fd98b
Add changelog test modules/default/defaultmodules.js
2017-04-13 23:44:37 -03:00
Rodrigo Ramírez Norambuena
59c25ef915
Merge remote-tracking branch 'roramirez_github/develop' into defaultModules-set
2017-04-13 23:43:07 -03:00
Rodrigo Ramírez Norambuena
7e9c4848fb
Sort dependencies in the file package.json
2017-04-13 08:40:51 -03:00
Rodrigo Ramírez Norambuena
467b1ad4f1
Add test match week number with clock module with configuration showWeek
2017-04-12 22:29:20 -03:00
Michael Teeuw
f45bd18cc2
Merge pull request #846 from bastilimbach/develop
...
Add the ability to use the docker image with a raspberry pi
2017-04-12 22:18:33 +02:00
Sebastian Limbach
4f844abc0c
Change copy flag to not replace existing modules
2017-04-12 20:21:51 +02:00
Sebastian Limbach
b688dcd4ba
Add changes to changelog
2017-04-12 20:20:30 +02:00
Sebastian Limbach
d5e902679b
Change linux distribution
...
I changed the linux distribution from node, which used Debian, to an arm based linux distribution so the application can be used on an arm based system (e.g. Raspberry)
2017-04-12 20:19:24 +02:00
Michael Teeuw
eae21e1371
Merge pull request #837 from roramirez/tests-vendors
...
Tests vendors
2017-04-11 10:45:47 +02:00
Rodrigo Ramírez Norambuena
d68d4c2c76
Add Changelog vendor_spec
2017-04-07 10:08:42 -03:00
Rodrigo Ramírez Norambuena
1ef451c048
Merge remote-tracking branch 'roramirez_github/develop' into tests-vendors
2017-04-07 10:06:33 -03:00
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
Michael Teeuw
5c41e24b99
Merge pull request #832 from MichMich/MichMich-patch-1
...
Add missing dependency.
2017-04-07 08:40:12 +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
31609a8aba
Add missing dependency.
2017-04-06 16:34:16 +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
Michael Teeuw
3748488200
Merge pull request #824 from roramirez/instruction_installer
...
Fix instruction README for install by script
2017-04-06 16:22:29 +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
