Rodrigo Ramírez Norambuena
0d3c03d1e3
Restore code removed on Merges on 2017-03-17
2017-03-17 22:36:21 -03:00
Michael Teeuw
b4dfce4a44
Merge branch 'fewieden-calendar-multiple-icons' into develop
2017-03-17 15:37:40 +01:00
Michael Teeuw
91ca3939b3
Fix Merge Conflicts
2017-03-17 15:36:55 +01:00
Andrew McOlash
4d3b6b1486
Merge remote-tracking branch 'upstream/develop' into excluded_events
2017-03-17 07:25:42 -05:00
fewieden
ccb81179ab
fix config option
2017-03-16 16:57:55 +01:00
Andrew McOlash
5466e1b733
Remove unnecessary string from excluded array
2017-03-12 20:22:40 -05:00
Andrew McOlash
5df818a19c
Add in support to hide and exclude events based on a filter
2017-03-12 11:36:40 -05:00
Beh
f8d80422b2
Fixed Travis CI errors
...
Changed indentation from spaces to tabs
changed strings from single quote to double quote
2017-03-07 00:34:17 +01:00
Beh
9848f80630
Added support for more authentication methods for the default calendar module
...
HTTP Basic, Digest and OAuth2/Bearer authentications are now supported
by the calendar module
2017-03-07 00:12:43 +01:00
Rodrigo Ramírez Norambuena
d97571ce0c
Fix tab documentacion calendar for colored option
2017-03-06 02:11:27 -03:00
Rodrigo Ramírez Norambuena
fb754f9bc7
fixed minor word mistake
2017-02-11 19:34:43 -03:00
fewieden
6cb3cf8747
fix indentation
2017-02-08 00:05:28 +01:00
fewieden
2f71a43420
dry pattern
2017-02-07 23:51:13 +01:00
Kyle Carson
9f659eef1b
Fix formatting
2017-01-30 16:35:21 -06:00
Kyle Carson
14cc642e54
Support calendar-specific maximumEntries and maximumNumberOfDays
2017-01-30 16:26:42 -06:00
Jeremias Arnstadt
e249092f91
used mardown in calendar README
2017-01-29 11:17:00 +01:00
Jeremias Arnstadt
5c0b04bfc8
fixed linting issues
2017-01-29 00:59:38 +01:00
Jeremias Arnstadt
bc257f4951
Merge branch 'develop' of https://github.com/artifactdev/MagicMirror
...
# Conflicts:
# modules/default/calendar/README.md
# modules/default/weatherforecast/README.md
2017-01-29 00:53:07 +01:00
Jeremias Arnstadt
4214293b76
updated README of weatherforecast and calendar module for color options
2017-01-28 18:32:06 +01:00
Jeremias Arnstadt
ce3ee909bf
added possibility to give each calendar another color
2017-01-28 18:21:02 +01:00
Rodrigo Ramírez Norambuena
422349c2d1
Change of examples configuration in README modules.
...
This change is related commit f59f035a7e
2017-01-24 17:22:17 -03:00
Joseph Bethge
63819c5757
fix calendar issues
2017-01-21 16:05:29 +01:00
Brian
2913120ff7
Update README files
2017-01-17 16:14:50 +01:00
Michael Teeuw
bd277b087a
Merge pull request #624 from tosti007/Calendar_Regex
...
Add Regexp possibility to titleReplace
2017-01-17 11:07:42 +01:00
Brian
c1a5f59c42
Remove Trailing space
2017-01-16 02:52:50 +01:00
Brian
49fb9108e9
Add Regexp possibility to titleReplace
...
Check if the given needle is a regexp, if so create one and use it
instead
2017-01-16 02:49:08 +01:00
Brian
c95a37130a
Remove unused uelf variable
2017-01-16 02:36:10 +01:00
Brian
29e82cc509
Fix Typo
...
Change E into R
2017-01-16 02:27:12 +01:00
Michael Teeuw
2f7be0559a
Switch to rrule-alt. Issue: #565
2017-01-14 19:31:24 +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
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
Andreas
21bf1dd1a3
Updated module READMEs with current default values
2016-12-12 14:52:00 +01:00
Rodrigo Ramírez Norambuena
9b86049964
newsfeed, calendar: Standardize user-agent.
...
Add node and MagicMirror version.
2016-12-08 01:29:55 -03:00
Rodrigo Ramírez Norambuena
83ee0534f2
fixed eslint error into modules for Javascript files
2016-12-02 23:23:54 -03: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
Rodrigo Ramírez Norambuena
07a86800c9
calendar: little fix format README
2016-11-12 21:10:37 -03:00
Chris van Marle
9fd81bf6c7
Add dateFormat to calendar module
2016-11-10 17:26:29 +01:00
Rodrigo Ramez Norambuena
1fa5c53b72
calendar: fix space vs tab into caledarfetcher.js
2016-11-05 21:23:37 -03:00
xander
2cc9356c32
Push location, geo and description on events stack for single and repeating events.
2016-10-20 09:05:12 +02:00
Michael Teeuw
5858e862d9
Broadcast calendar eventlist to other modules.
2016-10-14 15:23:03 +02:00
Michael Teeuw
29d87d7c48
Merge branch 'patch-4' of https://github.com/yo-less/MagicMirror into yo-less-patch-4
...
# Conflicts:
# CHANGELOG.md
2016-10-01 11:03:05 +02:00
