Merge branch 'patch-4' of https://github.com/yo-less/MagicMirror into yo-less-patch-4

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Michael Teeuw
2016-10-01 11:03:05 +02:00
3 changed files with 37 additions and 20 deletions

View File

@@ -126,6 +126,13 @@ The following properties can be configured:
<br><b>Default value:</b> <code>relative</code>
</td>
</tr>
<tr>
<td><code>getRelative</code></td>
<td>How much time (in hours) should be left until calendar events start getting relative?<br>
<br><b>Possible values:</b> <code>0</code> (events stay absolute) - <code>48</code> (48 hours before the event starts)
<br><b>Default value:</b> <code>6</code>
</td>
</tr>
<tr>
<td><code>urgency</code></td>
<td>When using a timeFormat of <code>absolute</code>, the <code>urgency</code> setting allows you to display events within a specific time frame as <code>relative</code>