summaryrefslogtreecommitdiffstats
path: root/apps/calendar/lib
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-04-215-56/+600
|\
| * implement shared calendar activation on server sideGeorg Ehrke2012-04-181-0/+9
| * fix merge conflictsGeorg Ehrke2012-04-151-13/+0
| |\
| * \ fix merge conflictsGeorg Ehrke2012-04-152-6/+22
| |\ \
| * | | fix class nameGeorg Ehrke2012-04-131-1/+1
| * | | fix merge conflictsGeorg Ehrke2012-04-133-41/+73
| |\ \ \
| * | | | fix calendarid in eventform and validation of calendaridGeorg Ehrke2012-04-122-10/+5
| * | | | fix bugs in share classGeorg Ehrke2012-04-121-1/+2
| * | | | fix bugs and optimize OC_Calendar_Object ClassGeorg Ehrke2012-04-111-10/+8
| * | | | make shared events editable and add (empty) classes for alarm and attendeesGeorg Ehrke2012-04-105-6/+38
| * | | | fix bug in share lib of calendarGeorg Ehrke2012-04-101-1/+1
| * | | | fix view of single shared eventsGeorg Ehrke2012-04-071-4/+3
| * | | | fix path and class nameGeorg Ehrke2012-04-071-2/+2
| * | | | fix bugs in share lib of calendarGeorg Ehrke2012-04-071-6/+10
| * | | | add output functions and access function to app.php of calendarGeorg Ehrke2012-04-071-52/+196
| * | | | remove unused code in OC_Calendar_App classGeorg Ehrke2012-03-311-5/+0
| * | | | rewrite OC_Calendar_APP classGeorg Ehrke2012-03-311-76/+143
| * | | | add public sharing fir calendars and events - add function in Share classGeorg Ehrke2012-03-311-0/+23
| * | | | fix group sql generator in calendar's share libGeorg Ehrke2012-03-261-5/+1
| * | | | add read only 'form' for shared eventsGeorg Ehrke2012-03-262-8/+43
| * | | | fix sql command in calendar's share libGeorg Ehrke2012-03-261-3/+3
| * | | | fix merge conflictsGeorg Ehrke2012-03-251-1/+1
| |\ \ \ \
| * | | | | Merge branch 'master' into calendar_sharingGeorg Ehrke2012-03-161-10/+1
| |\| | | |
| * | | | | fix merge conflictsGeorg Ehrke2012-03-034-6/+22
| |\ \ \ \ \
| * \ \ \ \ \ fix merge conflictsGeorg Ehrke2012-02-254-15/+17
| |\ \ \ \ \ \
| * | | | | | | add getowner function to OC_Calendar_ObjectGeorg Ehrke2012-02-221-0/+5
| * | | | | | | add is_editing_allowed function to OC_Calendar_ShareGeorg Ehrke2012-02-221-0/+17
| * | | | | | | clean up sql commands in OC_Calendar_ShareGeorg Ehrke2012-02-221-19/+35
| * | | | | | | add 'permissions' as a sql condition in allSharedwithuserGeorg Ehrke2012-02-211-2/+7
| * | | | | | | fix sql commandGeorg Ehrke2012-02-181-2/+2
| * | | | | | | show shared calendarsGeorg Ehrke2012-02-112-5/+20
| * | | | | | | add sharing management for calendarsGeorg Ehrke2012-02-041-0/+163
* | | | | | | | Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-153-16/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Remove useless, unmaintained dav.phpJakob Sack2012-04-151-13/+0
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | reuse OC_L10N objectsRobin Appelman2012-04-141-1/+1
| * | | | | | improve flexibility of search providers a bitRobin Appelman2012-04-141-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-133-31/+55
|\| | | | |
| * | | | | Calendar: Update category list when updating/adding eventBart Visscher2012-04-132-0/+10
| * | | | | Calendar: Document active parameter in allCalendarsBart Visscher2012-04-131-3/+1
| * | | | | Calendar: Fix saving of Categories in an eventBart Visscher2012-04-131-6/+2
| * | | | | Calendar: Implement rescan of CategoriesBart Visscher2012-04-131-0/+27
| * | | | | Use the same category input and management as the contacts appBart Visscher2012-04-121-1/+15
| * | | | | Remove unused function getCategoryOptions from OC_Calendar_ObjectBart Visscher2012-04-121-21/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-194-16/+22
|\| | | |
| * | | | Contacts: small fixes and cleanupsBart Visscher2012-03-071-10/+1
| | |_|/ | |/| |
| * | | Add /dav.php, a single location bundling all *DAV-operations.Jakob Sack2012-03-021-1/+14
| * | | Search: Change provider registration to class name, for lazy loading of searc...Bart Visscher2012-03-011-3/+2
| * | | Small cleanupsBart Visscher2012-03-011-1/+2
| * | | Calendar: fix bug in creating DTEND from DTSTARTBart Visscher2012-03-011-1/+3
| | |/ | |/|
* / | replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTimeGeorg Ehrke2012-02-242-10/+10
|/ /