Commit Graph

1566 Commits

Author SHA1 Message Date
Michael Teeuw 063574023b Merge pull request #873 from roramirez/fixme_for_test_week_number
ADD fixme wanted where the day if sunday for test number of week
2017-05-26 14:40:06 +02:00
Michael Teeuw 0db40bbb32 Merge pull request #893 from xuanyou/xuanyou-patch-compliments-documentation
Xuanyou patch compliments documentation
2017-05-18 12:35:42 +02:00
Michael Teeuw f66114e203 Merge pull request #892 from markuzSchmidt/patch-1
Correction of Documentation of `resume()`
2017-05-18 12:34:17 +02:00
Michael Teeuw 2fcc064b0f Merge pull request #879 from retroflex/develop 2017-05-18 12:33:58 +02:00
Michael Teeuw a4c441a1b7 Merge branch 'develop' into develop 2017-05-18 12:33:34 +02:00
xuanyou cbb6e4d6f3 Update docs: classes config variable default value 2017-05-18 18:25:17 +08:00
xuanyou 34361ccd1c Update documentation for compliments module
Added documentation for the config variable "classes" that allows the user to override the css classes of the compliments module display.

Fixed the erroneous "a default calendar is shown" to "default compliments".
2017-05-18 18:14:43 +08:00
markuzSchmidt c953936798 Update README.md 2017-05-17 22:00:55 +02:00
Michael Teeuw 6fd2a6ef34 Merge pull request #885 from z0diak/develop
fixing issue with installer (#884)
2017-05-15 20:25:41 +02:00
Vladimir Filimonov a60f4e3bad fixing issue https://github.com/MichMich/MagicMirror/issues/884 2017-05-06 21:42:02 +03:00
Michael Teeuw ab30ea766b Merge pull request #882 from roramirez/remove_log_socketclient
Remove commented log not used in js/socketclient.js
2017-05-03 17:34:29 +02:00
Michael Teeuw 099a7c46b7 Merge pull request #881 from roramirez/spelling-changelog
Fix spelling Changelog
2017-05-03 17:34:15 +02:00
Michael Teeuw a7afcd9644 Merge branch 'develop' into spelling-changelog 2017-05-03 17:34:03 +02:00
retroflex 7c80eec755 Merge branch 'develop' into develop 2017-05-02 21:24:36 +02:00
retroflex 07c50c20b6 Spaces -> tabs. 2017-05-02 21:20:35 +02:00
Michael Teeuw 08d841f6c5 Merge pull request #872 from Arkkimaagi/patch-2
Support showing wind direction with an arrow
2017-05-01 14:29:23 +02:00
Michael Teeuw 6b144c5816 Merge branch 'develop' into patch-2 2017-05-01 14:29:14 +02:00
Michael Teeuw 322cec0980 Merge pull request #877 from Arkkimaagi/better-translations
Improve translation flexibility
2017-05-01 14:27:35 +02:00
Michael Teeuw 73a47b2853 Merge pull request #883 from jasonyork/develop
Update currentweather to support indoor temperature
2017-05-01 14:26:05 +02:00
Jason York 0036ec2214 Update currentweather to support indoor temperature 2017-04-30 20:58:25 -05:00
Rodrigo Ramírez Norambuena 98dc69893e Fix spelling Changelog 2017-04-29 23:25:57 -03:00
retroflex af48af5085 Updated changelog: Added option to set a separate date format for full day events. 2017-04-28 23:56:05 +02:00
retroflex 0b2279a113 Merge remote-tracking branch 'original/develop' into develop 2017-04-28 23:39:57 +02:00
retroflex ba63a44ec8 Added option to set a separate date format for full day events. 2017-04-28 23:31:07 +02:00
Mikko Tapionlinna 7c20d2f97c Merge branch 'develop' into better-translations 2017-04-28 15:35:28 +03:00
Mikko Tapionlinna 8e7369f0b5 Merge branch 'develop' into patch-2 2017-04-28 15:34:40 +03:00
Mikko Tapionlinna 5f80deb5b7 Added direction as an arrow feature to CHANGELOG.md 2017-04-28 15:33:32 +03:00
Mikko Tapionlinna 826fdbf342 Add flexible word order translations to CHANGELOG.md 2017-04-28 15:31:07 +03:00
Mikko Tapionlinna 7e5186c3c7 Add documentation for new translate features 2017-04-28 15:24:41 +03:00
Mikko Tapionlinna 2bc5253725 Set default value for showWindDirectionAsArrow 2017-04-28 13:59:07 +03:00
Mikko Tapionlinna f58787bb50 Add documentation for showWindDirectionAsArrow 2017-04-28 13:58:52 +03:00
Michael Teeuw 88a01d39ee Merge pull request #869 from roramirez/check-default-modules-directory
Check default modules directory
2017-04-26 09:36:19 +02:00
Mikko Tapionlinna ee88897b18 Add better support for translations with backwards compatibility 2017-04-25 23:15:34 +03:00
Rodrigo Ramírez Norambuena b26f9e316d ADD fixme wanted where the day if sunday for test number of week 2017-04-24 22:49:15 -03:00
Mikko Tapionlinna 0e486b45e1 Support showing wind direction with an arrow
As described in https://github.com/MichMich/MagicMirror/issues/871 this feature lets user use arrow instead of an abbreviation for wind directions. This can be especially helpful on languages like Finnish that do not have all the compass directions English has.
2017-04-24 23:54:32 +03:00
Rodrigo Ramírez Norambuena f730d2fc27 Add changelog test directories for default modules 2017-04-22 21:23:48 -03:00
Rodrigo Ramírez Norambuena 26303c8617 Merge remote-tracking branch 'roramirez_github/develop' into check-default-modules-directory 2017-04-22 21:22:41 -03:00
Michael Teeuw a6485b61a4 Merge pull request #867 from fewieden/bugfix-compliment-duplicates
bugfix for duplicated compliments
2017-04-22 18:58:32 +02:00
Michael Teeuw 7db07bca35 Merge branch 'develop' into bugfix-compliment-duplicates 2017-04-22 18:58:26 +02:00
Michael Teeuw 19bbe0fc1f Merge pull request #865 from jeliasson/patch-1
Indent and double-quoute
2017-04-22 18:57:50 +02:00
Michael Teeuw 2b2c2de583 Merge pull request #863 from roramirez/message-port-server
Message port server
2017-04-22 18:57:35 +02:00
Michael Teeuw b05534472c Merge pull request #862 from roramirez/dev-args
Change method for check if pass dev parameter
2017-04-22 18:57:12 +02:00
Michael Teeuw 30aa8d469c Merge pull request #861 from roramirez/unit-calendar
Unit calendar
2017-04-22 18:56:55 +02:00
fewieden c4282a3593 null isn't typeof undefined 2017-04-22 12:25:51 +02:00
fewieden 778107aae9 add edge case anytime only 2017-04-22 12:09:52 +02:00
fewieden 581af762f9 bugfix for duplicated compliments 2017-04-22 11:35:42 +02:00
Johan Eliasson 31e63b576b Indent and double-quoute 2017-04-21 23:02:33 +02:00
Michael Teeuw efb592dce5 Merge pull request #856 from bastilimbach/develop
Outsource Dockerfiles
2017-04-19 21:45:42 +02:00
Michael Teeuw fa5b936d7b Merge pull request #858 from roramirez/check-week-number
Check week number
2017-04-19 21:45:23 +02:00
Rodrigo Ramírez Norambuena 4904bd53ef Fix grunt double quotes unit calendar_spec 2017-04-19 00:45:55 -03:00