Commit graph

177 commits

Author SHA1 Message Date
Georg Ehrke
bda0026374 fix birthday calendar 2012-06-29 15:43:18 +02:00
Georg Ehrke
77c66e8cc4 move some documentation to the right place 2012-06-27 21:05:46 +02:00
Georg Ehrke
25a50f00bd add merge calendar function and add some documentation to OC_Calendar_Calendar 2012-06-27 20:56:58 +02:00
Georg Ehrke
b9ce4e1f40 add OC_Calendar_Object::createUID() 2012-06-26 15:20:29 +02:00
Thomas Tanghus
df1eca4fa2 Also load categories from VJOURNAL. 2012-06-24 22:25:32 +02:00
Bart Visscher
1d07b9e291 Calendar: Missing userid in allCalendars call 2012-06-21 23:30:04 +02:00
Thomas Tanghus
b17bf59ced Only search for VEVENTs. 2012-06-21 20:51:23 +02:00
Georg Ehrke
f5740a6f92 fix a PHP Notice 2012-06-21 15:20:15 +02:00
Bart Visscher
fedfa4c98e DateTime objects are directly comparable 2012-06-20 21:38:56 +02:00
Georg Ehrke
0f13cbb47d Merge branch 'master' into calendar_repeat 2012-06-20 20:14:08 +02:00
Bjoern Schiessle
5a2c93ec2d use sanitizeHTML() function 2012-06-20 15:11:14 +02:00
Georg Ehrke
5ce0097b6f Calendar: only run ->expand if the event is repeating 2012-06-19 13:30:45 +02:00
Georg Ehrke
c8c105df33 Calendar: fix modifying of end DateTime object 2012-06-19 13:04:11 +02:00
Georg Ehrke
13aad8f06d some little fixes for repeating events caching 2012-06-18 15:58:01 +02:00
Georg Ehrke
beed6e0f0e Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""
This reverts commit e3b58f6783.
2012-06-18 14:47:58 +02:00
Georg Ehrke
e3b58f6783 Revert "create OC_Calendar_Object::generateStartEndDate function"
This reverts commit aa7ce480f4.
2012-06-18 14:47:09 +02:00
Georg Ehrke
aa7ce480f4 create OC_Calendar_Object::generateStartEndDate function 2012-06-15 12:11:22 +02:00
Georg Ehrke
4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Georg Ehrke
22a33b509f use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod 2012-06-15 11:39:19 +02:00
Georg Ehrke
e4529301ff change some function names in OC_Calendar_Repeat 2012-06-15 11:34:21 +02:00
Georg Ehrke
5c10683432 use easier parseable date to init datetime 2012-06-15 11:29:16 +02:00
Georg Ehrke
6f20d51646 fix generateEventOutput for calendar hook 2012-06-15 11:25:29 +02:00
Thomas Tanghus
f6aa366857 Make sure there is a calendar after delete. 2012-06-15 02:10:55 +02:00
Thomas Tanghus
ad32c20300 Agree on argument type (cleaned this time). 2012-06-15 01:51:26 +02:00
Thomas Tanghus
6d43e6565e Revert "Agree on argument type."
This reverts commit 0f6b1be0e6.
2012-06-15 00:53:13 +02:00
Thomas Tanghus
0f6b1be0e6 Agree on argument type. 2012-06-15 00:50:42 +02:00
Thomas Tanghus
1e76a530ea No need to find calendar twice. 2012-06-15 00:28:12 +02:00
Georg Ehrke
6bd80d6457 show username of the body who shares in the summary 2012-06-13 22:07:23 +02:00
Georg Ehrke
08a3a4f185 fix a bug in OC_Calendar_Repeat 2012-06-11 21:43:24 +02:00
Lukas Reschke
68f819ee20 Removed double sanitization 2012-06-11 19:47:42 +02:00
Georg Ehrke
09e744b793 connect OC_Calendar_repeat to events.php 2012-06-11 17:25:03 +02:00
Georg Ehrke
009c4c9045 add function isrepeating to OC_Calendar_Object class and change OC_Calendar_Object::getUTCforMDB from protected to public 2012-06-11 17:15:50 +02:00
Georg Ehrke
2dd84373c1 fix bug in OC_Calendar_Repeat 2012-06-11 17:13:20 +02:00
Georg Ehrke
32b366585d some fixes for repeating events caching 2012-06-11 15:36:48 +02:00
Georg Ehrke
5cb9d82b45 modify hooks in OC_Calendar_Calendar 2012-06-11 15:16:59 +02:00
Georg Ehrke
eb3605aa63 modify hooks in OC_Calendar_Object 2012-06-11 15:15:13 +02:00
Georg Ehrke
01bd048bb3 remove insert id 2012-06-11 15:01:48 +02:00
Georg Ehrke
40459c8c66 some work on repeating events caching - basic class should work now :) 2012-06-11 15:00:51 +02:00
Georg Ehrke
ece1162949 use native sabredav functions to generate repeating events 2012-06-11 10:55:26 +02:00
Georg Ehrke
ef1b04619d fix merge conflicts 2012-06-10 18:38:01 +02:00
Georg Ehrke
cfb9c764ca fix creation of monthly repeated events 2012-06-09 15:15:00 +02:00
Georg Ehrke
a9b561430a add hooks for events 2012-06-09 12:30:09 +02:00
Georg Ehrke
7ed30649bb add hooks for calendars 2012-06-09 12:18:25 +02:00
Georg Ehrke
cac995ee9f some more work on repeating events caching 2012-06-09 11:49:25 +02:00
Georg Ehrke
ac74d87e3e some work on repeating events caching 2012-06-08 22:22:16 +02:00
Georg Ehrke
2fa19ce9a0 Merge branch 'master' into calendar_repeat 2012-06-06 10:12:11 +02:00
Bjoern Schiessle
dcc5b5ca0a xss vulnerability fixed 2012-06-05 10:37:22 +02:00
Georg Ehrke
7a8e322679 some work for repeating events caching 2012-06-01 11:30:54 +02:00
Georg Ehrke
29b17672b4 a bit of work for repeating events caching 2012-05-29 19:46:17 +02:00
Georg Ehrke
a56f2dbce7 Merge branch 'master' into calendar_repeat 2012-05-29 13:16:08 +02:00