Commit Graph

1109 Commits

Author SHA1 Message Date
Michael Teeuw c0d936fa4d Merge pull request #635 from roramirez/tests
minor fix textual
2017-01-21 19:28:43 +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
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
Brian c95a37130a Remove unused uelf variable 2017-01-16 02:36:10 +01:00
Brian 29e82cc509 Fix Typo
Change E into R
2017-01-16 02:27:12 +01:00
Michael Teeuw a4cb53fdb4 Show correct units for showRainAmount 2017-01-15 21:16:01 +01:00
Michael Teeuw 865dce6f68 Add info about issue #611. 2017-01-15 20:36:11 +01:00
Michael Teeuw 1d02154d99 Fix eslint issues. 2017-01-15 19:41:42 +01: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
Michael Teeuw ec57a240d5 Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop 2017-01-15 19:38:53 +01:00
Michael Teeuw 949f7587dc Solve issue: #611 2017-01-15 19:38:46 +01:00
Michael Teeuw 55cce646e0 Merge pull request #621 from roramirez/fix-changelog-blackslash
fix blackslash introduce in Pull Request #619
2017-01-15 19:30:50 +01:00
Rodrigo Ramírez Norambuena 4c3dce694a fix blackslash introduce in Pull Request #619
URL Pull Request: https://github.com/MichMich/MagicMirror/pull/619
2017-01-15 14:10:48 -03:00
Michael Teeuw 46d5b70391 Merge pull request #619 from nhubbard/develop
Add postinstall script
2017-01-15 00:19:58 +01:00
Michael Teeuw 08a102d182 Merge pull request #620 from roramirez/Changelog-reference
Changelog: fix number reference issue.
2017-01-15 00:18:21 +01:00
Rodrigo Ramírez Norambuena 1cf8e08d4b Changelog: fix number reference issue. 2017-01-14 19:37:38 -03:00
Nicholas Hubbard 65a8b83150 Add Cache 2017-01-14 15:46:38 -05:00
Nicholas Hubbard f4c8db654c Fix postinstall error. 2017-01-14 15:42:29 -05:00
Nicholas Hubbard 5c4d1c0259 Add CHANGELOG.md 2017-01-14 15:37:32 -05:00
Nicholas Hubbard a459f8b84c Merge branch 'develop' of https://github.com/nhubbard/MagicMirror into develop
This merge is necessary to make Git happy.
2017-01-14 15:34:23 -05:00
Nicholas Hubbard 0d672420f7 Add postinstall script for installation 2017-01-14 15:32:59 -05:00
Michael Teeuw 2f7be0559a Switch to rrule-alt. Issue: #565 2017-01-14 19:31:24 +01:00
Michael Teeuw 0623ae1f87 Merge pull request #596 from IgniparousTempest/master
Afrikaans Translation
2017-01-12 19:48:04 +01:00
Michael Teeuw 8ae946c2c5 Merge branch 'develop' into master 2017-01-12 19:46:34 +01:00
Michael Teeuw bb75f6ffce Merge pull request #601 from morozgrafix/russian_translations2
Russian translations2
2017-01-12 19:45:10 +01:00
Michael Teeuw fcfe83f0cc Merge pull request #599 from qistoph/hover
Pass pointer-events on fullscreen overlay to underlaying modules
2017-01-12 19:44:46 +01:00
Michael Teeuw 5cbcded929 Merge branch 'develop' into russian_translations2 2017-01-12 19:42:50 +01:00