Andreas Cederström
2d03ff63cf
Slice the list of all events to honor config.maximumEntries
...
Scenario:
* Specify more than one calendar in `config.calendars`
* Specify a maximum number of entries in `config.maximumEntries`
Result:
The module will show as many as maximumEntries for EACH calendar
Expected:
The module shall not show more than a total of maximumEntries, regardless of how many calendars I specify
Fixes #1043
2017-10-01 21:47:10 +02:00
Rodrigo Ramírez Norambuena
4bd36fc29e
Merge branch 'develop' into deprecation-warning
2017-08-13 04:28:06 -03:00
Bas van Wetten
e0414e4eb9
Add unittest for calendar module
...
Add unittest for 'getLocalSpecification' function.
2017-07-31 22:36:14 +02:00
Michael Teeuw
18b61e35be
Merge branch 'develop' into unittest-calendar
2017-07-31 15:04:16 +02:00
Rodrigo Ramírez Norambuena
06af327e5e
Added deprecation warning for authentication of the calendar module.
...
Discussed in Review
9848f80630 (r105531731)
2017-07-30 22:56:27 -04:00
Bas van Wetten
35e3b889c3
Add new unit tests
...
Add new unit tests for 'shorten' function in calendar module
2017-07-29 16:02:53 +02:00
Bas van Wetten
b89ee67daf
Merge branch 'fix-issue-961' into fix-issue-963
2017-07-28 21:33:10 +02:00
Bas van Wetten
7bd256c311
Fix calendar.js bug issue #963
...
Fixed calendar specific configuration settings maximumEntries and maximumNumberOfDays not overriding global setting
2017-07-28 21:07:38 +02:00
Bas van Wetten
4add7cd0b3
Fix calendar.js bug
...
Fix bug where excludedEvents count towards maximumEntries displayed
2017-07-28 17:47:22 +02:00
Michael Teeuw
c492ea77f1
Merge pull request #943 from QNimbus/fix-issue-940
...
Fix issue #940
2017-07-12 10:55:43 +02:00
Unknown
db0bd3fa2d
Fix issue #940
...
Fix for issue 940 - time was incorrectly displayed in a 12-hour fashion regardless of the 24 hour clock preference in config.js
2017-07-09 11:46:59 +02:00
eouia
561ae102fb
add symbol and color on broadcasted events
2017-07-06 11:57:16 +02:00
Unknown
3404ebbbb8
Calender respects timeformat
...
In reference to issue #776 , made changes to calendar.js to respect timeformat config option if it is used
2017-06-26 14:43:40 +02:00
Veeck
96c338859b
More lazy sunday cleanups of missing semicolons, unused vars and other small thins
2017-06-11 11:53:55 +02:00
retroflex
7c80eec755
Merge branch 'develop' into develop
2017-05-02 21:24:36 +02:00
retroflex
07c50c20b6
Spaces -> tabs.
2017-05-02 21:20:35 +02:00
retroflex
ba63a44ec8
Added option to set a separate date format for full day events.
2017-04-28 23:31:07 +02:00
Mikko Tapionlinna
ee88897b18
Add better support for translations with backwards compatibility
2017-04-25 23:15:34 +03:00
Andrew McOlash
63ae2b8095
Add in ability to wrap calendar events to multiple lines
2017-04-02 15:06:58 -05:00
Johan Hammar
47c356692f
Fix a few more typos
2017-03-30 22:14:11 +02: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
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
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
14cc642e54
Support calendar-specific maximumEntries and maximumNumberOfDays
2017-01-30 16:26:42 -06: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
ce3ee909bf
added possibility to give each calendar another color
2017-01-28 18:21:02 +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
29e82cc509
Fix Typo
...
Change E into R
2017-01-16 02:27:12 +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
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
a12a4cd8f2
Merge remote-tracking branch 'mich/develop' into hidePrivate
...
Resolved merge conflict
2016-12-22 21:53:47 +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
Chris van Marle
9fd81bf6c7
Add dateFormat to calendar module
2016-11-10 17:26:29 +01: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
Robin Appelman
90207f9b68
add support for http basic auth for calendars
2016-09-08 21:29:17 +02:00
Jens
63351553d8
calendar.js doesn't overcapitalize future events
2016-09-04 14:24:49 +02:00
Jens
4630740ac7
Added 'getRelative' tag
2016-09-04 00:05:02 +02:00
