wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4684 commits 157 branches 562 tags 714 MiB
Commit graph

148 commits

Author SHA1 Message Date
Georg Ehrke
08a3a4f185 fix a bug in OC_Calendar_Repeat 2012-06-11 21:43:24 +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
Brice Maron
22cd0f1cda Correct typo in last_insert_id for calendar and pg fix #oc-731 2012-05-28 20:41:39 +00:00
Georg Ehrke
7d49bf7f6e some changes in calendar repeat class 2012-05-18 11:48:18 +02:00
Georg Ehrke
f7366de673 Merge branch 'master' into calendar_repeat 2012-05-17 22:17:23 +02:00
Thomas Mueller
583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Georg Ehrke
ddf0903ace add post user delete hook for calendar sharing 2012-05-13 20:03:52 +02:00
Georg Ehrke
dfef36ba2f some changes for calendar repeat class 2012-05-12 23:16:11 +02:00
Georg Ehrke
b1cae9651e add functions get cached events in a specific time period 2012-05-12 23:00:21 +02:00
Georg Ehrke
dc34ed5a12 Merge branch 'master' into calendar_repeat 2012-05-12 22:55:35 +02:00
Brice Maron
ffe5ef2268 Correct calendar loading when calendar are from hooks. fix oc-619 2012-05-10 19:36:30 +00:00
Brice Maron
9dbc6b5158 Correct wrong DB quotes for calendar share functions 2012-05-06 15:41:14 +00:00
Georg Ehrke
f75a7c084f add class for repeating events 2012-05-01 16:16:12 +02:00
Bart Visscher
d854e4a144 Calendar: fix return of insert id 2012-05-05 22:32:55 +02:00
Bart Visscher
2facf509cc Merge branch 'tasks' for Tasks app 2012-05-05 18:26:13 +02:00
Frank Karlitschek
9bcc5c11a8 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Bart Visscher
1e47156226 Merge branch 'master' into tasks 2012-05-04 17:04:11 +02:00
Bart Visscher
07ff1e723a Calendar: Fix repeating events 2012-05-03 23:33:44 +02:00
Bart Visscher
077ea94f71 Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud 
Conflicts:
	apps/calendar/ajax/events.php
 2012-05-03 23:18:43 +02:00
Frank Karlitschek
97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek
43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek
351740601a port oc_response 2012-05-03 10:46:27 +02:00
Frank Karlitschek
82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek
2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek
e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek
70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Georg Ehrke
0918fc7d91 fix merge conflicts 2012-04-21 23:21:50 +02:00
Georg Ehrke
de71842888 implement shared calendar activation on server side 2012-04-18 11:50:12 +02:00
Georg Ehrke
77cefdedb8 Merge branch 'master' into sabredav_1.6 2012-04-15 22:28:11 +02:00
Georg Ehrke
dc18e65b46 fix merge conflicts 2012-04-15 22:26:55 +02:00
Jakob Sack
9b1d6246a9 Remove useless, unmaintained dav.php 2012-04-15 16:50:44 +02:00