Rodrigo Ramírez Norambuena
9725091233
Merge remote-tracking branch 'roramirez_github/develop' into check-wrong-configuration
2017-04-06 21:32:48 -03:00
Rodrigo Ramírez Norambuena
19b9d3737e
Merge branch 'develop' into test-set-MM_PORT
2017-03-30 16:12:08 -03:00
Johan Hammar
cc9a429689
Corrected minor typo
2017-03-28 22:44:47 +02:00
Rodrigo Ramírez Norambuena
1ea50ea917
Merge branch 'develop' into test-set-MM_PORT
2017-03-28 13:16:56 -03:00
Michael Teeuw
c62082b924
Merge pull request #785 from roramirez/colors-error
...
Use color red for error when the configuration file is not found.
2017-03-18 21:50:18 +01:00
Michael Teeuw
61935942cf
Merge pull request #783 from roramirez/fixspace-code-main
...
Remote extra space main.js
2017-03-18 20:44:32 +01:00
Rodrigo Ramírez Norambuena
f89f704a69
Add task to check configuration file syntax.
2017-03-18 09:45:32 -03:00
Rodrigo Ramírez Norambuena
2c0ca78265
Merge branch 'colors-error' into check-wrong-configuration
2017-03-18 06:00:49 -03:00
Rodrigo Ramírez Norambuena
0d3c03d1e3
Restore code removed on Merges on 2017-03-17
2017-03-17 22:36:21 -03:00
Rodrigo Ramírez Norambuena
c282bb2fe1
Fix if MM_PORT enviroment variable is set
2017-03-10 18:20:11 -03:00
Rodrigo Ramírez Norambuena
1bdc46969c
Add information message when the ipWhitelist is configurate with []
2017-03-10 16:36:17 -03: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
Rodrigo Ramírez Norambuena
aa1f515fcf
Remote extra space main.js
2017-03-10 00:27:47 -03:00
Rodrigo Ramírez Norambuena
1e3b866c8b
Use color red for error when the configuration file is not found.
2017-03-05 22:20:35 -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
Rodrigo Ramírez Norambuena
ddff2b2982
Move colors into utils file
2017-02-28 01:41:21 -03:00
Michael Teeuw
e697ee72fa
Merge pull request #734 from roramirez/refactor-routes
...
refactor code for include multiples routes on js/server.js
2017-02-25 22:12:43 +01:00
Michael Teeuw
3badafaa82
Merge pull request #737 from roramirez/deprecated-options
...
Deprecated options
2017-02-25 11:38:30 +01:00
Rodrigo Ramírez Norambuena
365bc900b0
Add more information and tag FIXME on Hotfix code
2017-02-24 18:52:33 -03:00
Rodrigo Ramírez Norambuena
bd0da63f4c
use colors for warning message in deprecated options
2017-02-21 20:28:12 -03:00
Rodrigo Ramírez Norambuena
db0b663a3d
Put file deprecated into js directory
...
Request in Pull Request #569
Initial work by @olexs
2017-02-21 19:28:53 -03:00
Rodrigo Ramírez Norambuena
fd7fe129e2
Merge remote-tracking branch 'olexs/deprecated-config-notify' into deprecated-options
2017-02-21 19:13:33 -03:00
Rodrigo Ramírez Norambuena
ab226d16c8
refactor code for include multiples routes on js/server.js
2017-02-21 10:33:54 -03:00
Rodrigo Ramírez Norambuena
8bda91aafb
Prevent crash system if cannot load a js script or style sheet.
2017-02-12 13:06:11 -03:00
fewieden
6cb3cf8747
fix indentation
2017-02-08 00:05:28 +01:00
fewieden
2f71a43420
dry pattern
2017-02-07 23:51:13 +01:00
Rodrigo Ramírez Norambuena
ee0418e719
hotfix PL #673
2017-01-31 22:08:38 -03:00
Michael Teeuw
b02920c43c
Merge pull request #674 from morozgrafix/test_branch
...
Restructured Test Suite
2017-01-31 21:52:53 +01:00
Sebastian Limbach
42b806b500
Fixed whitespace
2017-01-31 21:19:37 +01:00
Sergey Morozov
86fdd91597
Restructured Test Suite
...
- separated tests into e2e and unit directories
- created configs directory structure to support test framework
- added/modified `npm run test`, `npm run test:unit` and `npm run test:e2e` to target all, unit and e2e tests respectively
- modified some of the test names to be more descriptive
New structure of the Test Suite has following directory tree:
```
tests
├── configs
│ ├── env.js
│ └── modules
│ ├── clock
│ │ ├── clock_12hr.js
│ │ ├── clock_24hr.js
│ │ └── clock_showPeriodUpper.js
│ └── helloworld
│ └── helloworld.js
├── e2e
│ ├── env_spec.js
│ └── modules
│ ├── clock_spec.js
│ └── helloworld_spec.js
└── unit
├── functions
│ └── cmp_versions_spec.js
└── global_vars
└── root_path_spec.js
```
2017-01-31 11:08:53 -08:00
Sebastian Limbach
e68fea185d
Merge branch 'develop' into feature/docker
2017-01-31 19:48:38 +01:00
Sebastian Limbach
354b745c39
Added Docker support
2017-01-31 11:41:40 +01:00
Rodrigo Ramírez Norambuena
0d8d8f0426
Add tests configs directory as express route.
2017-01-30 12:17:23 -03:00
Rodrigo Ramírez Norambuena
bbdc43c750
Use configuration file in index.html when is set MM_CONFIG_FILE
2017-01-29 17:00:56 -03:00
Joseph Bethge
d3c0b9a438
fix module hidden status
2017-01-28 12:31:33 +01:00
Olexandr Savchuk
90616c82b6
Added console warning for deprecated config options
2017-01-27 18:02:50 +01:00
Rodrigo Ramírez Norambuena
2f9a272696
Improvement of code block about from discussion Pull Request #653
...
https://github.com/MichMich/MagicMirror/pull/653
2017-01-27 13:13:04 -03:00
Rodrigo Ramírez Norambuena
1e9b35d18f
Fix bug validation when is not set MM_CONFIG_FILE enviroment variable
2017-01-26 21:13:58 -03:00
Rodrigo Ramírez Norambuena
3818e48218
remove console.log
2017-01-25 19:05:40 -03:00
Rodrigo Ramírez Norambuena
86e553e756
Set configuration file by enviroment variable:
...
Enable ability to set configuration file by the enviroment variable
called MM_CONFIG_FILE.
2017-01-24 02:59:20 -03:00
Rodrigo Ramírez Norambuena
b8917a3c0e
Hotfix introduced client error on commit 3a8d72d
...
Noticed by @qistoph
https://github.com/MichMich/MagicMirror/pull/623#issuecomment-273505208
2017-01-20 18:44:28 -03:00
Rodrigo Ramírez Norambuena
3a8d72db31
init tests:
...
This patch propouse use the mocha for testing MagicMirror.
2017-01-15 15:40:23 -03:00
Rodrigo Ramez Norambuena
6552157894
Remove white flash on boot up
...
When the electron app is started appear a white flash before show the
MagicMirror system.
This patch remove the white flash on boot up.
2017-01-04 13:06:24 -03:00
Chris van Marle
3947deb7bd
Add async callback to module when loaded
2017-01-02 13:04:15 +01:00
Michael Teeuw
09e6a6a4ad
Merge branch 'master' into develop
2016-12-31 21:16:09 +01:00
Michael Teeuw
23bcac2e55
Merge pull request #585 from roramirez/extra-spaces
...
fix tabs, remove extra spaces and lines.
2016-12-31 19:12:24 +01:00
