Michael Teeuw
18b61e35be
Merge branch 'develop' into unittest-calendar
2017-07-31 15:04:16 +02: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
154e33a2c3
Make times align to the top of the cell
2017-04-02 15:10:00 -05: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
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 f59f035a7ec5e64ab9e629521b39a548a6430b8b
Now is used grunt for check ESLint syntax validation of config/* files
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
