Michael Teeuw
8e129143f1
Merge pull request #671 from Nosrac/develop
...
Support calendar-specific maximumEntries and maximumNumberOfDays
2017-01-31 08:42:50 +01:00
Michael Teeuw
6d50cbba6f
Merge pull request #672 from morozgrafix/test_branch
...
Add missing 'chai-as-promised' dependency
2017-01-31 08:41:54 +01:00
Sergey Morozov
7731878f36
Add missing 'chai-as-promised' dependency
...
When I attempted to run e2e tests I got following error:
```
$npm run test:e2e
> magicmirror@2.1.1 test:e2e /Users/sergeym/localDev/MagicMirror
> ./node_modules/mocha/bin/mocha tests/e2e --recursive
module.js:471
throw err;
^
Error: Cannot find module 'chai-as-promised'
...
```
Adding `chai-as-promised` to `package.json` and running npm install fixes it.
2017-01-30 15:33:23 -08:00
Kyle Carson
9f659eef1b
Fix formatting
2017-01-30 16:35:21 -06:00
Kyle Carson
14cc642e54
Support calendar-specific maximumEntries and maximumNumberOfDays
2017-01-30 16:26:42 -06:00
Michael Teeuw
c47852cd0a
Merge pull request #661 from artifactdev/master
...
Color options for calendar and weather forecast
2017-01-30 20:56:34 +01:00
Michael Teeuw
c3bfaa31ee
Merge branch 'develop' into master
2017-01-30 20:55:53 +01:00
Michael Teeuw
832505a315
Merge pull request #669 from roramirez/test-e2e
...
Test e2e
2017-01-30 20:55:25 +01:00
Rodrigo Ramírez Norambuena
e2dc5ef4f2
fix eslint change single quote by double quote
2017-01-30 12:46:21 -03:00
Rodrigo Ramírez Norambuena
c75ee042a8
add e2e test enviroment
2017-01-30 12:36:11 -03:00
Rodrigo Ramírez Norambuena
d474d518ca
test e2e module helloworld
2017-01-30 12:24:49 -03:00
Rodrigo Ramírez Norambuena
52b8dbcbb1
separate test type. Create directory for End-to-end testing.
2017-01-30 12:17:45 -03:00
Rodrigo Ramírez Norambuena
0d8d8f0426
Add tests configs directory as express route.
2017-01-30 12:17:23 -03:00
artifactdev
ed12deae25
Update CHANGELOG.md
...
Added color options for calendar and weather forecast to changelog
2017-01-30 13:17:44 +01:00
Michael Teeuw
7f1e7c981d
Merge pull request #666 from roramirez/index-mm-config-file-env-var
...
Use configuration file in index.html when is set MM_CONFIG_FILE
2017-01-30 12:53:44 +01:00
Michael Teeuw
cc26688d82
Merge pull request #668 from Jopyth/patch-4
...
missing comma in sv.json translation
2017-01-30 12:52:31 +01:00
Jopyth
a0fa3a6063
missing comma in sv.json translation
2017-01-30 09:28:37 +01: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
Michael Teeuw
c73b9b4882
Merge pull request #663 from Snille/develop
...
Added and translated some missing strings in the sv.json file.
2017-01-29 11:39:47 +01:00
Jeremias Arnstadt
e249092f91
used mardown in calendar README
2017-01-29 11:17:00 +01:00
Jeremias Arnstadt
5c0b04bfc8
fixed linting issues
2017-01-29 00:59:38 +01:00
Jeremias Arnstadt
bc257f4951
Merge branch 'develop' of https://github.com/artifactdev/MagicMirror
...
# Conflicts:
# modules/default/calendar/README.md
# modules/default/weatherforecast/README.md
2017-01-29 00:53:07 +01:00
Erik Pettersson
e738ee0812
Added information about the sv.json update.
2017-01-29 00:09:51 +01:00
snille
ebb2db17f3
Fixed the Swedish translation.
2017-01-29 00:06:06 +01:00
Jeremias Arnstadt
4214293b76
updated README of weatherforecast and calendar module for color options
2017-01-28 18:32:06 +01:00
Jeremias Arnstadt
ce3ee909bf
added possibility to give each calendar another color
2017-01-28 18:21:02 +01:00
Jeremias Arnstadt
09ba1e2470
added possibility to color max and min temprature
2017-01-28 18:01:37 +01:00
Michael Teeuw
68444b81cc
Merge pull request #659 from Jopyth/patch-hidden-status
...
fix module hidden status
2017-01-28 13:44:49 +01:00
Joseph Bethge
d3c0b9a438
fix module hidden status
2017-01-28 12:31:33 +01:00
Michael Teeuw
6e2f1f72c6
Merge pull request #657 from roramirez/splashscreen-halt-reboot
...
Show splash screen image on reboot and halt.
2017-01-28 06:21:25 +01:00
Michael Teeuw
c82eec09b7
Merge pull request #658 from roramirez/fix-validate-file-config-by-variable
...
Fix bug validation when is not set MM_CONFIG_FILE enviroment variable
2017-01-28 06:20:23 +01:00
Rodrigo Ramírez Norambuena
de69fe1745
Show splash screen image on reboot and halt.
2017-01-27 13:42:20 -03:00
Michael Teeuw
9bd42ac221
Merge pull request #656 from roramirez/env-config-file-pl
...
Code change discussion Pull Request #653
2017-01-27 17:27:03 +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
Michael Teeuw
552ea0356e
Merge pull request #652 from roramirez/electron-issues
...
Electron issues
2017-01-27 09:02:20 +01:00
Michael Teeuw
ff6bd91ef7
Merge branch 'develop' into electron-issues
2017-01-27 09:01:57 +01:00
Michael Teeuw
835f20f872
Merge pull request #653 from roramirez/env-config-file
...
Set configuration file by enviroment variable
2017-01-27 09:00:23 +01: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
Michael Teeuw
5d63065057
Merge pull request #650 from qistoph/testing
...
Fix grunt errors in root_path.js and syntax in da.json
2017-01-25 12:25:04 +01:00
Chris van Marle
ae41ed1d51
Fix syntax in DA translation
2017-01-25 12:00:38 +01:00
Chris van Marle
36ead2251a
Fix grunt errors
2017-01-25 11:58:20 +01:00
Michael Teeuw
dc7093f68a
Merge pull request #648 from qistoph/testing
...
Add root_path testing
2017-01-25 10:03:53 +01:00
Michael Teeuw
6c79d2b008
Merge pull request #649 from roramirez/example-quote-config
...
Change of examples configuration in README modules.
2017-01-25 10:02:43 +01:00
Rodrigo Ramírez Norambuena
422349c2d1
Change of examples configuration in README modules.
...
This change is related commit f59f035a7ec5e64ab9e629521b39a548a6430b8b
Now is used grunt for check ESLint syntax validation of config/* files
2017-01-24 17:22:17 -03:00
Chris van Marle
7dbfa0b203
Add root_path testing
2017-01-24 17:58:04 +01:00
Michael Teeuw
57ea2ac039
Merge pull request #645 from roramirez/grunt-config
...
Add config/* to the Grunt target.
2017-01-24 14:43:32 +01:00
Michael Teeuw
a9e664e89d
Merge pull request #646 from zoliaz1993/develop
...
Update Hungarian language.
2017-01-24 14:42:59 +01:00
Michael Teeuw
c0e2210da3
Merge pull request #647 from qistoph/testing
...
Run npm test on Travis
2017-01-24 14:40:14 +01:00
Chris van Marle
b13c6f283a
Run npm test on Travis
2017-01-24 12:03:19 +01:00
