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
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
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
Zoltán Rónai
8181b9a31c
Rename hu to hu.json
...
extension (**.json)
2017-01-24 09:09:13 +01:00
Zoltán Rónai
105e4f990d
Update translations.js
...
Text aligned.
2017-01-24 08:59:37 +01:00
zoliaz1993
9670d74345
Update Hungarian language.
...
Add Alert module Hun translation.
Text aligned formality.
2017-01-24 08:54:39 +01: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
566ea9a110
Use script for start MagicMirror
2017-01-24 02:12:36 -03:00
Rodrigo Ramírez Norambuena
f59f035a7e
Add config/* to the Grunt target.
...
Also, this change can be check config errors by syntax.
2017-01-23 18:03:26 -03:00
Michael Teeuw
4c6d4f3caf
Merge pull request #642 from kthorri/master
...
Icelandic Translation
2017-01-23 19:41:50 +01:00
Michael Teeuw
8af87bac22
Merge pull request #644 from morozgrafix/tests_cleanup
...
Minor clean up for test suite
2017-01-23 19:41:27 +01:00
Sergey Morozov
690567659c
Minor clean up for test suite
...
@roramirez thanks for starting adding tests. I figured that we might as well grunt them and follow same rules for linting as we do for rest of JS code in the repo.
I've made following minor modifications:
- added tests to the grunt target
- fixed indentation in package.json
- made tests a bit more descriptive
- fixed eslint errors surfaced by grunt
2017-01-23 09:59:19 -08:00
Michael Teeuw
d9c7ee8976
Fixed Changelog to match the correct version.
2017-01-23 16:18:42 +01:00
Michael Teeuw
95cf554de4
Merge branch 'develop' into master
2017-01-23 16:17:28 +01:00
kthorri
47a87a14f5
Fixing typo
2017-01-23 14:55:24 +00:00
kthorri
5e860b6850
Added icelandic translation to changelog
2017-01-23 14:53:57 +00:00
kthorri
9a983e7565
Adding icelandic translation json file
2017-01-23 14:53:18 +00:00
kthorri
00197d131d
Adding Icelandic translation to translation.js
2017-01-23 14:51:59 +00:00
Michael Teeuw
9758f3c9d2
Add the Hungarian translation.
2017-01-23 11:38:48 +01:00
Michael Teeuw
e7d7425b6e
Merge pull request #641 from zoliaz1993/master
...
Add the Hungarian translation.
2017-01-23 11:38:12 +01:00
Michael Teeuw
b566c81ae7
Merge branch 'develop' into master
2017-01-23 11:36:15 +01:00
Michael Teeuw
742837e7a1
Merge pull request #640 from roramirez/fix-mm-script-path
...
Fix path for script MagicMirror on pm2
2017-01-23 10:29:54 +01:00
zoliaz1993
5087dbd756
Update hu.json
...
Remove + line.
2017-01-23 09:44:09 +01:00
Rodrigo Ramez Norambuena
b893ae7c14
Fix path for script MagicMirror on pm2
2017-01-22 23:47:17 -03:00
Michael Teeuw
1f7863057f
Merge pull request #636 from Jopyth/fix_calendar
...
Fix Calendar Issues
2017-01-22 16:10:31 +01:00
Michael Teeuw
3dd3afd21f
Update CHANGELOG.md
2017-01-22 12:23:11 +01:00
Michael Teeuw
387d3b7335
Merge pull request #638 from villevirtanen/patch-2
...
Updates to fi.json
2017-01-22 12:22:02 +01:00
villevirtanen
782bfd058b
Update fi.json
...
DAYAFTERTOMORROW, UPDATE_NOTIFICATION and UPDATE_NOTIFICATION_MODULE added.
2017-01-22 10:46:28 +02:00
Michael Teeuw
c0d936fa4d
Merge pull request #635 from roramirez/tests
...
minor fix textual
2017-01-21 19:28:43 +01:00
Joseph Bethge
63819c5757
fix calendar issues
2017-01-21 16:05:29 +01:00
Rodrigo Ramírez Norambuena
08cbac6277
minor fix textual
2017-01-21 11:04:11 -03:00
Michael Teeuw
68c0a9aec4
Merge pull request #634 from roramirez/note-readme-cp-config-sample
...
Add note in step of copy for sample file configuration in README.
2017-01-21 11:58:59 +01:00
Michael Teeuw
1c585815a1
Merge pull request #633 from roramirez/tests
...
Hotfix introduced client error on commit 3a8d72d
2017-01-21 11:57:31 +01:00
Rodrigo Ramírez Norambuena
853ec7320f
Add note in step of copy for sample file configuration in README.
...
This note is related if was used installer script.
2017-01-20 19:07:37 -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
