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,008 Commits 3 Branches 49 Tags
Commit Graph

303 Commits

Author SHA1 Message Date
Michael Teeuw
09e6a6a4ad Merge branch 'master' into develop 2016-12-31 21:16:09 +01:00
Michael Teeuw
23bcac2e55 Merge pull request #585 from roramirez/extra-spaces 
fix tabs, remove extra spaces and lines.
 2016-12-31 19:12:24 +01:00
Rodrigo Ramírez Norambuena
a48cb052c2 resolv some missing fix eslint rules no-trailing-spaces 2016-12-30 17:47:33 -03:00
Rodrigo Ramírez Norambuena
19d906c5e4 fix tabs, remove extra spaces and lines. 2016-12-29 22:23:08 -03:00
henglert
3607875714 Fix repeating count of yearly calendar events 
The occurrence counter for a yearly repeating event e was calculated by "current year" - "e.firstYear", instead of "e.year" - "e.firstYear". That leads to a repeating event counter - 1 at the end of the year. E.g.
event e: first Date: 2015-01-02, yearly repetition
repeating count evaluated on 2015-12-31: 2015-2015 = 0 => incorrect
repeating count evaluated on 2016-01-01: 2016-2015 = 1 => correct
Fix: repeating count has to be calculated from event date instead of current date.
 2016-12-29 15:31:01 +01:00
Ben Brosnahan
97120bd1f1 Add error handling to newsfeed 2016-12-26 01:17:45 +00:00
Daniel Buecheler
243cdfefa2 Fix failed linter test 2016-12-22 22:00:59 +01:00
Daniel Buecheler
a12a4cd8f2 Merge remote-tracking branch 'mich/develop' into hidePrivate 
Resolved merge conflict
 2016-12-22 21:53:47 +01:00
Michael Teeuw
989dca5792 Merge pull request #563 from aschulz90/mm-fixes 
Mm fixes
 2016-12-14 10:05:20 +01:00
Andreas
de71b1b397 Revert calendar default value and add documentation 2016-12-13 17:16:46 +01:00
Rodrigo Ramírez Norambuena
2decee1d87 Merge branch 'develop' into user-agent fix conflict. 2016-12-13 10:40:10 -03: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
6c1dbc5e61 Updated module READMEs with current default values 2016-12-12 14:55:07 +01:00
Andreas
21bf1dd1a3 Updated module READMEs with current default values 2016-12-12 14:52:00 +01:00
Rodrigo Ramírez Norambuena
53d2c7e89f compliments: add abilty to set classes for compliments module 2016-12-09 10:49:49 -03:00
Rodrigo Ramírez Norambuena
9b86049964 newsfeed, calendar: Standardize user-agent. 
Add node and MagicMirror version.
 2016-12-08 01:29:55 -03:00
Michael Teeuw
96653170a2 Merge pull request #551 from olexs/round-temps 
Option to display temperatures rounded to nearest integer
 2016-12-08 15:47:44 +01:00
Rodrigo Ramírez Norambuena
9e2bbd50b6 README compliments: Close code tag and fix tabs 2016-12-07 22:03:32 -03:00
Chris van Marle
0d18266ad1 Fetch remote git only if repo has a remote 2016-12-07 08:38:45 +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
Daniel Bücheler
c66ecbdd29 Added hidePrivate to README.md 
Added explanation of hidePrivate option to the Calendar Module's README
 2016-11-30 21:28:44 +01:00
Daniel Buecheler
e61bccab36 Calendar Module: Added false as default for hidePrivate 2016-11-30 21:24:04 +01:00
Daniel Buecheler
cfeef98261 Private events are hidden 
Events with the class:PRIVATE iCal property are not shown in the
calendar module. They are not added to the array of calendar
events in createEventList.

This feature can be turned on and off in the config via the property
hidePrivate: true/false.
 2016-11-30 21:09:57 +01:00
Brian
829ccfca88 Updated changelog and compliments documentation. 2016-11-30 10:31:19 -05:00
Brian
950fa84d1c Added capability to load compliments from the host file system. 2016-11-30 10:30:49 -05:00
Rodrigo Ramírez Norambuena
db6e0ccf63 clock: remove statement of repetead code. 2016-11-26 11:45:12 -03:00
Michael Teeuw
222e2166ff Merge pull request #530 from Jopyth/patch-3 
update documentation to module default config
 2016-11-21 11:03:10 +01:00
Michael Teeuw
7dc25ec425 Merge pull request #532 from roramirez/default_value_animation_newsfeed 
newsfeed: fix set default value for animationSpeed option in README
 2016-11-21 11:02:52 +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
Rodrigo Ramírez Norambuena
6c9d33f05c newsfeed: fix set default value for animationSpeed option in README 2016-11-20 20:06:58 -03:00
Jopyth
3c8fa3382b update documentation to module default config 2016-11-20 16:47:49 +01:00
Chris van Marle
482dd4db76 Check updates for configured modules only 2016-11-18 12:57:45 +01:00
Chris van Marle
7329515a4d Check for module updates 2016-11-16 18:19:44 +01:00
Rodrigo Ramírez Norambuena
07a86800c9 calendar: little fix format README 2016-11-12 21:10:37 -03:00
Michael Teeuw
0bab32315c Merge PR 2016-11-10 20:06:00 +01:00
Michael Teeuw
d6aaafb069 Merge pull request #508 from roramirez/var_updateTimer 
currentweather: Remove variable updateTimer not used
 2016-11-10 20:01:25 +01:00
Michael Teeuw
731fcb8829 Merge pull request #507 from roramirez/update_es_translations 
Update es translations
 2016-11-10 19:39:37 +01:00
Rodrigo Ramírez Norambuena
deda869cc5 currentweather: Remove variable updateTimer not used 2016-11-10 15:33:16 -03:00
Rodrigo Ramírez Norambuena
048985bdf4 translations: add Spanish translations for alert module 2016-11-10 15:26:55 -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
Chris van Marle
9fd81bf6c7 Add dateFormat to calendar module 2016-11-10 17:26:29 +01:00
Stefan Bols
d4946d931a Create da.json 2016-11-09 17:40:51 +01:00
derwehr
41327bfb03 quick fix to prevent issues with feeds that omit url and link 2016-11-07 20:46:28 +01:00
derwehr
66ef72a040 added url to the newsfeed fetcher 2016-11-07 17:49:32 +01:00