Commit Graph

  • 9ca6180207 Merge branch 'templates' into develop Michael Teeuw 2017-10-01 13:10:25 +02:00
  • 30179ad977 Setup of new dev release. Michael Teeuw 2017-10-01 12:39:48 +02:00
  • b799609749 Merge pull request #1039 from MichMich/develop v2.1.3 v.2.1.3 Michael Teeuw 2017-10-01 12:36:53 +02:00
  • efb6994ae7 Changes in preparation of 2.1.3 Michael Teeuw 2017-10-01 12:34:54 +02:00
  • cd129fb055 Revert "Fix Indentation?" Nicholas Hubbard 2017-09-30 19:44:54 -04:00
  • 880a977dd6 Merge pull request #1038 from roramirez/templates-fixes Michael Teeuw 2017-09-30 13:39:00 +02:00
  • 6eceffb403 Merge pull request #1037 from roramirez/lint-fix Michael Teeuw 2017-09-30 13:36:38 +02:00
  • 795e33881c This fix the follow things: * The default screen on missing configuration file and syntax error. * Tests Rodrigo Ramírez Norambuena 2017-09-29 19:10:03 -03:00
  • d310c3857f Little lint fix Rodrigo Ramírez Norambuena 2017-09-29 18:33:17 -03:00
  • 837e275bfd Update fork Nicholas Hubbard 2017-09-29 10:11:46 -04:00
  • 7be6031e19 Merge branch 'weather-refactor' of https://github.com/MichMich/MagicMirror into weather-refactor Nicholas Hubbard 2017-09-29 10:11:22 -04:00
  • 8c53908cc4 Update CHANGELOG.md Michael Teeuw 2017-09-29 13:37:24 +02:00
  • 589b54984a Add slack badge. Michael Teeuw 2017-09-29 13:36:44 +02:00
  • 3f30ed5251 Add info about weather forecast. Michael Teeuw 2017-09-29 13:01:08 +02:00
  • 3f9181905a Fix typo's. Michael Teeuw 2017-09-29 11:05:59 +02:00
  • 29f3a81666 Fix weather forecast. Michael Teeuw 2017-09-29 10:04:42 +02:00
  • 5efc43260e Switch to async rendering. Michael Teeuw 2017-09-28 16:43:38 +02:00
  • e01794a07f First Nunchucks Implementation. Michael Teeuw 2017-09-28 16:11:25 +02:00
  • 5fde095a6f Merge pull request #1024 from roramirez/openweathermap-forescast Michael Teeuw 2017-09-28 14:44:13 +02:00
  • 3237af2d85 Add translation: Welsh (Cymraeg) Michael Teeuw 2017-09-28 14:42:21 +02:00
  • 953b666ebd Update translations.js Michael Teeuw 2017-09-28 14:41:30 +02:00
  • 417bb4bf37 Merge pull request #1022 from meigwilym/meigwilym-welsh-lang Michael Teeuw 2017-09-28 14:39:26 +02:00
  • a55213d88a Merge pull request #1019 from EdgardosReis/develop Michael Teeuw 2017-09-28 14:38:55 +02:00
  • ec84d190f4 Remove newline. Michael Teeuw 2017-09-28 14:38:39 +02:00
  • 1b0bad72de Remove newline. Michael Teeuw 2017-09-28 14:38:08 +02:00
  • 931055708d Merge pull request #1033 from roramirez/one-instance-all-module-position-spec Michael Teeuw 2017-09-26 08:56:06 +02:00
  • 15fd570b49 Refactor modules_position_spec use one instance for all it statements Rodrigo Ramírez Norambuena 2017-09-25 20:52:27 -03:00
  • ff9c6bac0a Add a small forecast example. Michael Teeuw 2017-09-22 13:26:44 +02:00
  • 713111254b First implementation of the currentWeatherView Michael Teeuw 2017-09-22 12:26:47 +02:00
  • 5b1462a3e8 Add readme. Michael Teeuw 2017-09-22 10:37:39 +02:00
  • 2bf18d8bda Fix Indentation? Nicholas Hubbard 2017-09-21 20:12:25 -04:00
  • 7f2e643e62 Add Dark Sky Module Nicholas Hubbard 2017-09-21 20:06:42 -04:00
  • ef172592b8 A first setup of the new Weather Module Michael Teeuw 2017-09-21 16:38:18 +02:00
  • 5e51a438a7 Merge pull request #1025 from ryck/feature/indoorHumidity Michael Teeuw 2017-09-20 15:19:53 +02:00
  • 7f768059e6 Update README Ricardo Gonzalez 2017-09-17 16:33:23 +01:00
  • ea70175a17 Merge branch 'develop' into feature/indoorHumidity Ricardo Gonzalez 2017-09-17 16:32:37 +01:00
  • 74a736691a Merge remote-tracking branch 'upstream/develop' into develop Ricardo Gonzalez 2017-09-17 16:31:27 +01:00
  • 86ff44adfc Welsh (Cymraeg) language file Mei Gwilym 2017-09-13 22:17:07 +01:00
  • 58b763e935 Hack fix issue #1017 Rodrigo Ramírez Norambuena 2017-09-12 10:28:33 -03:00
  • 5c90cc59aa Updated pt.json translation EdgardosReis 2017-09-10 21:42:01 +01:00
  • 710ab44073 Merge pull request #1014 from roramirez/tests/unit/weatherforecast Michael Teeuw 2017-09-07 10:07:28 +02:00
  • b28c5e6807 Merge pull request #1015 from roramirez/show-missing-string-test-translations Michael Teeuw 2017-09-07 10:07:09 +02:00
  • e5ead9ed44 Merge pull request #1004 from qistoph/issue950 Michael Teeuw 2017-09-06 15:25:04 +02:00
  • d99897cf9d Update sample address Chris van Marle 2017-09-06 15:22:17 +02:00
  • 701a7cae02 Merge pull request #1011 from qistoph/fix_on_991 Michael Teeuw 2017-09-06 14:40:32 +02:00
  • 068b6a5470 Merge pull request #1012 from roramirez/set-version-express-ipfilter Michael Teeuw 2017-09-06 14:19:30 +02:00
  • 45d597ac49 set version of express-ipfilter: Rodrigo Ramírez Norambuena 2017-09-04 23:12:07 -03:00
  • a518d3f33f Describe default in comment of sample config Chris van Marle 2017-08-31 18:24:26 +02:00
  • 2f05228d91 More secure defaults. Chris van Marle 2017-08-25 18:40:55 +02:00
  • 335ae0105f Fix grunt errors Chris van Marle 2017-08-31 18:36:52 +02:00
  • 62ce7a0e37 Weather forecast settings match current weather Chris van Marle 2017-08-31 18:18:19 +02:00
  • afa0fb8da1 Fix JavaScript error in weatherforecast Chris van Marle 2017-08-31 18:03:23 +02:00
  • 763d835f4e Merge pull request #1006 from gcarret/patch-1 Michael Teeuw 2017-08-29 14:17:43 +02:00
  • 0289872dcd Merge pull request #1000 from QNimbus/fix-issue-986 Michael Teeuw 2017-08-29 14:15:27 +02:00
  • 2810141bd6 Merge pull request #997 from roramirez/extra-tab-translations/zh_cn.json Michael Teeuw 2017-08-29 14:14:32 +02:00
  • 93ea22c69d Merge pull request #996 from roramirez/default-hello-world Michael Teeuw 2017-08-29 14:14:12 +02:00
  • daf76a311c Merge pull request #991 from DanielWeeber/temperature-scale-show Michael Teeuw 2017-08-29 14:13:43 +02:00
  • b94271a725 Update fr.json gcarret 2017-08-29 07:21:10 +02:00
  • 1456aeedf2 TestSuite: Show the missing strings for translations files. Rodrigo Ramírez Norambuena 2017-08-28 21:30:36 -03:00
  • 4c6589a57e Update fr.json with added translations gcarret 2017-08-27 14:30:58 +02:00
  • 5b9a61b7db Added e2e test for font files Bas van Wetten 2017-08-21 14:44:47 +02:00
  • 96e71695c5 Fix issue #986 Bas van Wetten 2017-08-21 11:44:24 +02:00
  • 2e7dd1bde3 Fix extra tab file translations/zh_cn.json Rodrigo Ramírez Norambuena 2017-08-20 22:50:29 -03:00
  • 2de543f5f9 Add Changelog entry for new e2e test for helloworld module Rodrigo Ramírez Norambuena 2017-08-20 22:49:23 -03:00
  • a6ee20fca4 Merge remote-tracking branch 'roramirez_github/develop' into default-hello-world Rodrigo Ramírez Norambuena 2017-08-20 22:49:13 -03:00
  • 2d2f159e04 Small change for re-running Travis CI DanielWeeber 2017-08-16 12:11:57 +02:00
  • 5568e0c2ad Change Two Conditionals to UpperCase-If DanielWeeber 2017-08-16 10:00:38 +02:00
  • cb2cc0cb9e Fix linting? DanielWeeber 2017-08-15 20:57:18 +02:00
  • 5e573ca980 Show Scale of Temperature if config flag is set DanielWeeber 2017-08-15 19:54:35 +02:00
  • dcb4a315a6 Merge pull request #990 from roramirez/deprecation-warning Michael Teeuw 2017-08-13 19:21:17 +02:00
  • 4bd36fc29e Merge branch 'develop' into deprecation-warning Rodrigo Ramírez Norambuena 2017-08-13 04:25:42 -03:00
  • 1a7971ec82 Merge pull request #987 from roramirez/update-stylelint Michael Teeuw 2017-08-12 16:52:13 +02:00
  • c1eda034b3 Merge pull request #989 from roramirez/add-log-deprecated-function Michael Teeuw 2017-08-12 13:50:52 +02:00
  • 2294d722c7 Merge pull request #986 from roramirez/roboto-fonts-as-vendor Michael Teeuw 2017-08-12 13:50:23 +02:00
  • 7d053be6d1 Merge pull request #975 from QNimbus/unittests/calendar Michael Teeuw 2017-08-12 13:50:07 +02:00
  • 7a508661eb Merge branch 'develop' into update-stylelint Michael Teeuw 2017-08-10 16:29:30 +02:00
  • c976242ce5 Merge branch 'develop' into unittests/calendar Michael Teeuw 2017-08-10 16:27:00 +02:00
  • 2b77c372a3 Merge pull request #979 from CatoAntonsen/fix_filepath Michael Teeuw 2017-08-10 16:26:03 +02:00
  • b61cc67997 Merge pull request #983 from roramirez/test-unit-js-class Michael Teeuw 2017-08-10 12:15:31 +02:00
  • de8db1a86d Merge branch 'develop' into test-unit-js-class Michael Teeuw 2017-08-10 12:15:23 +02:00
  • abfdf0e1c2 Merge pull request #982 from roramirez/doc-roundValue Michael Teeuw 2017-08-10 12:14:58 +02:00
  • 1d662e354b Merge branch 'develop' into doc-roundValue Michael Teeuw 2017-08-10 12:14:16 +02:00
  • 663e9a9b5e Merge pull request #973 from roramirez/add-code-error-cliente-failstart Michael Teeuw 2017-08-10 12:12:24 +02:00
  • 8535409962 Merge branch 'develop' into add-code-error-cliente-failstart Michael Teeuw 2017-08-10 12:12:17 +02:00
  • cd5623b348 Merge pull request #972 from roramirez/add-warning-color-full-ip Michael Teeuw 2017-08-10 12:11:51 +02:00
  • 673e051bd5 Merge pull request #969 from roramirez/showWeek-test-es-language Michael Teeuw 2017-08-10 12:11:25 +02:00
  • 66c949057e Merge pull request #968 from roramirez/set-version-test-dependencies Michael Teeuw 2017-08-10 12:11:12 +02:00
  • aed09f0c64 Change to install Roboto fonts by npm Rodrigo Ramírez Norambuena 2017-08-06 01:13:52 -04:00
  • c05f306b0d Update stylelint package Rodrigo Ramírez Norambuena 2017-08-06 07:59:31 -04:00
  • 739fb99ced Resolved conflict unit tests between currentweather and newsfeed. Rodrigo Ramírez Norambuena 2017-08-06 07:53:03 -04:00
  • 7fc82ccead Update Changelog for unit tests for currentweather module Rodrigo Ramírez Norambuena 2017-08-07 20:42:32 -04:00
  • 8ae947f59c Merge remote-tracking branch 'origin/round-temp-unit' into doc-roundValue Rodrigo Ramírez Norambuena 2017-08-07 20:40:27 -04:00
  • d34b493b7d Fix clock_es_spec running before the clock_spec Rodrigo Ramírez Norambuena 2017-08-05 22:30:38 -04:00
  • 4df6e0ee7d Merge remote-tracking branch 'upstream/develop' into showWeek-test-es-language Rodrigo Ramírez Norambuena 2017-08-05 21:11:12 -04:00
  • aac4ef05e4 Merge remote-tracking branch 'upstream/develop' into test-unit-js-class Rodrigo Ramírez Norambuena 2017-08-05 19:50:34 -04:00
  • ea2f53e166 Merge remote-tracking branch 'upstream/develop' into doc-roundValue Rodrigo Ramírez Norambuena 2017-08-05 18:20:22 -04:00
  • f144ec67ab Add changelog entry for log in failed of clientonly Rodrigo Ramírez Norambuena 2017-08-05 17:48:20 -04:00
  • 7e42dcf0b5 Merge branch 'develop' into add-code-error-cliente-failstart Rodrigo Ramírez Norambuena 2017-08-05 17:47:36 -04:00
  • 87c4dc313a Merge branch 'develop' into set-version-test-dependencies Rodrigo Ramírez Norambuena 2017-08-05 17:44:51 -04:00
  • 0d29339898 Merge branch 'develop' into add-warning-color-full-ip Rodrigo Ramírez Norambuena 2017-08-05 17:44:05 -04:00