kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity
1,857 Commits 3 Branches 49 Tags
Commit Graph

85 Commits

Author SHA1 Message Date
Michael Teeuw
ba909c696d
Merge branch 'develop' into weather_decimal_marks 2017-12-31 12:24:25 +01:00
Torben Tigges
df0515cebf currentweather, weatherforecast, changed option of decimal comma to any decimal symbol 2017-12-31 01:15:59 +01:00
Torben Tigges
46c0e14d67 currentweather, weatherforecast, added option of decimal comma for temperature values to config 2017-12-30 22:03:26 +01:00
Jannick Fahlbusch
07e28bfee6
Use HTTPS instead of HTTP 
Chrome blocks insecure requests (HTTP) when MagicMirror is loaded
via HTTPS. This commit changes the protocol used for OpenWeatherMap.
 2017-10-06 21:31:06 +02:00
Rodrigo Ramírez Norambuena
d310c3857f Little lint fix 2017-09-29 18:33:17 -03:00
Ricardo Gonzalez
ea70175a17 Merge branch 'develop' into feature/indoorHumidity 
* develop: (71 commits)
  Update sample address
  set version of express-ipfilter:
  Describe default in comment of sample config
  More secure defaults.
  Fix grunt errors
  Weather forecast settings match current weather
  Fix JavaScript error in weatherforecast
  Update fr.json
  TestSuite: Show the missing strings for translations files.
  Update fr.json with added translations
  Added e2e test for font files
  Fix issue #986
  Fix extra tab file translations/zh_cn.json
  Add Changelog entry for new e2e test for helloworld module
  Small change for re-running Travis CI
  Change Two Conditionals to UpperCase-If
  Fix linting?
  Show Scale of Temperature if config flag is set
  Change to install Roboto fonts by npm
  Update stylelint package
  ...

# Conflicts:
#	CHANGELOG.md
 2017-09-17 16:32:37 +01:00
Rodrigo Ramírez Norambuena
ea2f53e166 Merge remote-tracking branch 'upstream/develop' into doc-roundValue 2017-08-05 18:20:22 -04:00
Ricardo Gonzalez
2c6ecaab5b Add ability for currentweather module to display indoor humidity via INDOOR_HUMIDITY notification 2017-07-23 23:55:32 +01:00
Veeck
20687d915a Remove unused vars and whitelines, cleanups 2017-06-02 19:35:10 +02:00
Michael Teeuw
3c82dfc0a5 Merge pull request #897 from roramirez/information-Beaufort-function 
Add link for information about Beaufort Wind Scale for ms2Beaufort
 2017-05-26 14:40:47 +02:00
Michael Teeuw
6b144c5816 Merge branch 'develop' into patch-2 2017-05-01 14:29:14 +02:00
Jason York
0036ec2214 Update currentweather to support indoor temperature 2017-04-30 20:58:25 -05: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
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
Johan Hammar
47c356692f Fix a few more typos 2017-03-30 22:14:11 +02:00
Rodrigo Ramírez Norambuena
60c5d96037 fix documentation currentweather and weatherforecast function 
roundValue:

This function toFixed return a string type not a number value.
 2017-03-27 12:18:36 -03:00
Rodrigo Ramírez Norambuena
f4408aa72c Add link for information about Beaufort Wind Scale for ms2Beaufort 
function in currentweather and weatherforecast module
 2017-03-26 16:57:46 -03:00
Andrew McOlash
e2099f0749 Fix indents 2017-03-13 06:27:54 -05:00
Andrew McOlash
3c60feed02 Add in degree label to solve issue #753 2017-03-13 06:24:04 -05: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
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
93c07b2b1e Fix: check if temperature is defined (0°) 2017-01-18 15:56:12 +01:00
Brian
2913120ff7 Update README files 2017-01-17 16:14:50 +01:00
Rodrigo Ramírez Norambuena
19d906c5e4 fix tabs, remove extra spaces and lines. 2016-12-29 22:23:08 -03:00
Michael Teeuw
989dca5792 Merge pull request #563 from aschulz90/mm-fixes 
Mm fixes
 2016-12-14 10:05:20 +01:00
Michael Teeuw
48db615ac8 Merge pull request #553 from roramirez/grunt-eslint-modules 
Grunt eslint modules
 2016-12-13 12:58:43 +01:00
Andreas
21bf1dd1a3 Updated module READMEs with current default values 2016-12-12 14:52:00 +01:00
Rodrigo Ramírez Norambuena
83ee0534f2 fixed eslint error into modules for Javascript files 2016-12-02 23:23:54 -03:00
Olexandr Savchuk
89bc3137ba Fixed method description. 2016-12-02 20:56:10 +01:00
Olexandr Savchuk
4d8d30f897 Moved misplaced method signature 2016-12-02 20:53:02 +01:00
Olexandr Savchuk
d67e9468c0 Changed roundTemp implementation to a cleaner one 2016-12-02 20:52:36 +01:00
Olexandr Savchuk
32df3e80b1 Renamed roundTemperature option to roundTemp 
Added changelog entry
 2016-12-02 17:33:41 +01:00
Olexandr Savchuk
3c33969d23 implemented roundTemperature in weather modules 2016-12-02 17:27:45 +01:00
Rodrigo Ramírez Norambuena
e425adc230 fix some tabs 2016-11-20 22:19:55 -03:00
Rodrigo Ramez Norambuena
2ea7ef327e currentweather: add option onlyTemp. 
Is added option onlyTemp for show only current temperature and weather
icon.
 2016-11-20 22:19:51 -03:00
Michael Teeuw
0bab32315c Merge PR 2016-11-10 20:06:00 +01:00
Rodrigo Ramírez Norambuena
deda869cc5 currentweather: Remove variable updateTimer not used 2016-11-10 15:33:16 -03:00
Rodrigo Ramez Norambuena
70d6d4246d compliments: Add feature use current weather. 
Possibility the use the actual type of currentweather to show the
compliments.
 2016-11-10 15:11:18 -03:00
Michael Teeuw
5c61f95093 Merge pull request #485 from roramirez/url_example_cities 
currentweather, weatherforecast: sample URL for LocationID:
 2016-11-06 12:33:20 +01:00
Rodrigo Ramírez Norambuena
678d5fc532 currentweather, weatherforecast: sample URL for LocationID: 
Changed from README the sample URLs for get the LocationID.
The http://bulk.openweather.org/sample/ doesn't work
 2016-11-03 15:36:04 -03:00
Rodrigo Ramírez Norambuena
cd146cf822 README Fix updateInterval for currentweather, weatherforecast: 
Fix milliseconds in the example for the updateInterval option
 2016-10-27 11:12:15 -03:00
Rodrigo Ramez Norambuena
2f6e650c1b currentweather, weatherforecast: fix locationID empty 
Fix when the option locationID the value = ''

If you have the next config

 config: {
            // See 'Configuration options' for more information.
            location: 'Chillan, Chile',
            locationID: '',
            appid: 'abcde12345abcde12345abcde12345ab'
        }

The modules dont get the data, because the parameters of query is created
in id=''
 2016-10-26 16:15:42 -03:00
Michael Teeuw
84dc1fa151 Possibility to use the the calendar feed as the source for the weather. 2016-10-14 17:42:07 +02:00
Michael Teeuw
4a53e4207c Small visual change. 2016-10-13 21:05:48 +02:00
Michael Teeuw
d8d425c963 Visual changes. 2016-10-01 14:06:10 +02:00
Michael Teeuw
ec64ac9f1d Merge branch 'current_humidity' of https://github.com/amcolash/MagicMirror into amcolash-current_humidity 2016-10-01 13:56:46 +02:00
Phil Oakley
25ddf2c651 currentweather module api url bugfix 
Running this on Raspberry Pi 2, node version v6.5.0, magicmirror@2.0.0

The current url created has a typo that causes the module to only display default weather units (Kelvin). After checking the website (http://openweathermap.org/current), there is no "/" at this location in the url. Removing it fixes the issue and allows the user to see the specified units in config.js.
 2016-09-05 19:06:21 -06:00
Andrew McOlash
853fa87012 Slight change to padding of humidity icon, just too much before 2016-08-28 01:58:56 -05:00