Commit Graph

1133 Commits

Author SHA1 Message Date
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
zoliaz1993 c4d70e7f9b Hungarian Translation 2017-01-20 13:49:10 +01:00
zoliaz1993 7f1b11d19b Hungarian translation 2017-01-20 13:45:14 +01:00
zoliaz1993 02a32dea40 Revert "Hungarian Translation"
This reverts commit d9e20ea17a.
2017-01-20 13:43:58 +01:00
zoliaz1993 d9e20ea17a Hungarian Translation 2017-01-20 13:43:44 +01:00
Michael Teeuw 039c2fe0a6 Merge pull request #630 from fry0815/fix_temperature_check
Fix temperature check
2017-01-19 20:04:56 +01:00
Michael Teeuw a967e73f9e Merge branch 'develop' into fix_temperature_check 2017-01-19 20:03:13 +01:00
Tino Ziegler 222e4154a1 changed to double quotes 2017-01-19 09:11:33 +01:00
Tino Ziegler 56413ee94e added fix 2017-01-18 16:04:02 +01:00
Tino Ziegler 93c07b2b1e Fix: check if temperature is defined (0°) 2017-01-18 15:56:12 +01:00
Michael Teeuw 27ed64a1af Merge pull request #628 from aaronaxvig/master
Provide example of syntax for electronOptions
2017-01-18 09:13:37 +01:00
Michael Teeuw ad68106c3c Merge pull request #629 from roramirez/branch-README
update branch Manual Installation in README.md
2017-01-18 09:13:13 +01:00
Rodrigo Ramírez Norambuena a591cf1d21 update branch Manual Installation in README.md 2017-01-18 01:36:14 -03:00
Michael Teeuw 03a4b8f5cf Merge pull request #627 from tosti007/README_tables
Replace HTML tables with Markdown tables
2017-01-17 17:23:27 +01:00
Michael Teeuw 2d8d25808d Merge pull request #623 from roramirez/tests
Init Tests
2017-01-17 17:22:50 +01:00
Michael Teeuw a82fcce734 Merge branch 'develop' into tests 2017-01-17 17:22:37 +01:00
Brian 0734e136d0 Update CHANGELOG 2017-01-17 16:15:39 +01:00
Brian 2913120ff7 Update README files 2017-01-17 16:14:50 +01:00
Michael Teeuw bd277b087a Merge pull request #624 from tosti007/Calendar_Regex
Add Regexp possibility to titleReplace
2017-01-17 11:07:42 +01:00
Brian fc00966b8b Update CHANGELOG 2017-01-17 11:05:18 +01:00
Michael Teeuw 495a76353f Merge pull request #622 from tosti007/develop
Fix typo and remove unused variable
2017-01-17 08:41:15 +01:00
Michael Teeuw 6ea225ed2a Rescale Splash Screen 2017-01-16 11:53:02 +01:00
Brian c1a5f59c42 Remove Trailing space 2017-01-16 02:52:50 +01:00
Brian 49fb9108e9 Add Regexp possibility to titleReplace
Check if the given needle is a regexp, if so create one and use it
instead
2017-01-16 02:49:08 +01:00
Rodrigo Ramírez Norambuena 4cb3b514ab update CHANGELOG test 2017-01-15 22:41:16 -03:00