Commit Graph

103 Commits

Author SHA1 Message Date
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
Georg Ehrke e292b1fcdb fix merge conflicts 2012-04-15 12:43:07 +02:00
Robin Appelman b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Robin Appelman 3babb8c22c improve flexibility of search providers a bit 2012-04-14 11:29:54 +02:00
Georg Ehrke ea3499a712 fix class name 2012-04-13 17:26:34 -04:00
Georg Ehrke 77a9e343aa Merge branch 'master' into sabredav_1.6 2012-04-13 16:42:10 -04:00
Georg Ehrke afcb0aee40 fix merge conflicts 2012-04-13 16:40:10 -04:00
Bart Visscher 4c52007996 Calendar: Update category list when updating/adding event 2012-04-13 21:13:58 +02:00
Bart Visscher 471e735b0c Calendar: Document active parameter in allCalendars 2012-04-13 21:13:58 +02:00
Bart Visscher 28e0d64ede Calendar: Fix saving of Categories in an event 2012-04-13 21:13:58 +02:00
Bart Visscher f9b7ed3a1f Calendar: Implement rescan of Categories 2012-04-13 21:13:58 +02:00
Georg Ehrke df2e788a1c fix calendarid in eventform and validation of calendarid 2012-04-12 23:15:19 -04:00
Georg Ehrke a7908ba76b fix bugs in share class 2012-04-12 22:11:48 -04:00
Bart Visscher 9165b5c28e Use the same category input and management as the contacts app 2012-04-12 23:10:49 +02:00
Bart Visscher b2011bd0a0 Remove unused function getCategoryOptions from OC_Calendar_Object 2012-04-12 23:10:49 +02:00
Georg Ehrke 0f16935763 fix bugs and optimize OC_Calendar_Object Class 2012-04-11 10:21:45 -04:00
Georg Ehrke 64d3301523 make shared events editable and add (empty) classes for alarm and attendees 2012-04-10 16:03:38 -04:00
Georg Ehrke eaa649cfb2 fix bug in share lib of calendar 2012-04-10 11:18:02 -04:00
Georg Ehrke 9294a95438 fix view of single shared events 2012-04-07 22:54:38 -04:00
Georg Ehrke 960553f9c4 fix path and class name 2012-04-07 22:45:44 -04:00
Georg Ehrke e940152bce fix bugs in share lib of calendar 2012-04-07 22:39:02 -04:00
Georg Ehrke e18c0d54f6 add output functions and access function to app.php of calendar 2012-04-07 22:35:29 -04:00
Georg Ehrke ca2c7001c4 remove unused code in OC_Calendar_App class 2012-03-31 16:15:04 -04:00
Georg Ehrke 70237f7ecc rewrite OC_Calendar_APP class 2012-03-31 16:13:04 -04:00
Georg Ehrke 10fc51dc92 add public sharing fir calendars and events - add function in Share class 2012-03-31 16:12:27 -04:00
Georg Ehrke 179bf15daf fix group sql generator in calendar's share lib 2012-03-26 15:30:04 +02:00
Georg Ehrke 71b32f7ad4 add read only 'form' for shared events 2012-03-26 15:24:43 +02:00
Georg Ehrke b7a5ae38c5 fix sql command in calendar's share lib 2012-03-26 09:48:58 +02:00
Georg Ehrke 19c101a660 fix merge conflicts 2012-03-25 14:02:02 +02:00
Georg Ehrke 33b06c4484 Merge branch 'master' into sabredav_1.6 2012-03-19 08:33:36 +01:00
Georg Ehrke 27218f85cb Merge branch 'master' into calendar_sharing 2012-03-16 12:17:58 +01:00
Bart Visscher d8cfe77ba5 Contacts: small fixes and cleanups 2012-03-07 21:46:42 +01:00
Georg Ehrke f2dcab50b5 fix merge conflicts 2012-03-03 15:06:51 +01:00
Jakob Sack 503e5cada3 Add /dav.php, a single location bundling all *DAV-operations. 2012-03-02 20:25:20 +01:00
Bart Visscher d1dcd7893c Search: Change provider registration to class name, for lazy loading of search providers 2012-03-01 22:59:35 +01:00
Bart Visscher 5dcd9e20d0 Small cleanups 2012-03-01 21:00:23 +01:00
Bart Visscher fe3bcb5fe2 Calendar: fix bug in creating DTEND from DTSTART 2012-03-01 21:00:22 +01:00
Georg Ehrke bfb67286c8 fix merge conflicts 2012-02-25 16:54:27 +01:00
Georg Ehrke 1d1dfcbc1a replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime 2012-02-24 22:20:40 +01:00
Georg Ehrke 0ae088a50a add getowner function to OC_Calendar_Object 2012-02-22 10:42:01 +01:00
Georg Ehrke 48f42176cd add is_editing_allowed function to OC_Calendar_Share 2012-02-22 10:41:16 +01:00
Georg Ehrke d20b8399c3 clean up sql commands in OC_Calendar_Share 2012-02-22 10:20:58 +01:00
Georg Ehrke 3d8d6d718b add 'permissions' as a sql condition in allSharedwithuser 2012-02-21 20:10:52 +01:00
Bart Visscher 86d2927c02 Calendar: Correct calendarcolor format for ical color property 2012-02-21 20:10:40 +01:00
Florian Pritz 9d2379742b apps/calendar: update ctag after deleteFromDAVData
Without this clients won't see the update because they compare ctags
before fetching the actual calendar to reduce traffic.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-02-19 21:42:47 +01:00