retroflex
07c50c20b6
Spaces -> tabs.
2017-05-02 21:20:35 +02:00
retroflex
af48af5085
Updated changelog: Added option to set a separate date format for full day events.
2017-04-28 23:56:05 +02:00
retroflex
0b2279a113
Merge remote-tracking branch 'original/develop' into develop
2017-04-28 23:39:57 +02:00
retroflex
ba63a44ec8
Added option to set a separate date format for full day events.
2017-04-28 23:31:07 +02:00
Michael Teeuw
88a01d39ee
Merge pull request #869 from roramirez/check-default-modules-directory
...
Check default modules directory
2017-04-26 09:36:19 +02:00
Rodrigo Ramírez Norambuena
f730d2fc27
Add changelog test directories for default modules
2017-04-22 21:23:48 -03:00
Rodrigo Ramírez Norambuena
26303c8617
Merge remote-tracking branch 'roramirez_github/develop' into check-default-modules-directory
2017-04-22 21:22:41 -03:00
Michael Teeuw
a6485b61a4
Merge pull request #867 from fewieden/bugfix-compliment-duplicates
...
bugfix for duplicated compliments
2017-04-22 18:58:32 +02:00
Michael Teeuw
7db07bca35
Merge branch 'develop' into bugfix-compliment-duplicates
2017-04-22 18:58:26 +02:00
Michael Teeuw
19bbe0fc1f
Merge pull request #865 from jeliasson/patch-1
...
Indent and double-quoute
2017-04-22 18:57:50 +02:00
Michael Teeuw
2b2c2de583
Merge pull request #863 from roramirez/message-port-server
...
Message port server
2017-04-22 18:57:35 +02:00
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
fewieden
c4282a3593
null isn't typeof undefined
2017-04-22 12:25:51 +02:00
fewieden
778107aae9
add edge case anytime only
2017-04-22 12:09:52 +02:00
fewieden
581af762f9
bugfix for duplicated compliments
2017-04-22 11:35:42 +02:00
Johan Eliasson
31e63b576b
Indent and double-quoute
2017-04-21 23:02:33 +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
Rodrigo Ramírez Norambuena
2b2136867d
Add change double message port in starting server
2017-04-18 22:31:16 -03:00
Rodrigo Ramírez Norambuena
c1830aa37c
Fix message port starting server
2017-04-18 22:21:55 -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
