Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts | Georg Ehrke | 2012-04-21 | 5 | -56/+600 |
|\ | |||||
| * | implement shared calendar activation on server side | Georg Ehrke | 2012-04-18 | 1 | -0/+9 |
| * | fix merge conflicts | Georg Ehrke | 2012-04-15 | 1 | -13/+0 |
| |\ | |||||
| * \ | fix merge conflicts | Georg Ehrke | 2012-04-15 | 2 | -6/+22 |
| |\ \ | |||||
| * | | | fix class name | Georg Ehrke | 2012-04-13 | 1 | -1/+1 |
| * | | | fix merge conflicts | Georg Ehrke | 2012-04-13 | 3 | -41/+73 |
| |\ \ \ | |||||
| * | | | | fix calendarid in eventform and validation of calendarid | Georg Ehrke | 2012-04-12 | 2 | -10/+5 |
| * | | | | fix bugs in share class | Georg Ehrke | 2012-04-12 | 1 | -1/+2 |
| * | | | | fix bugs and optimize OC_Calendar_Object Class | Georg Ehrke | 2012-04-11 | 1 | -10/+8 |
| * | | | | make shared events editable and add (empty) classes for alarm and attendees | Georg Ehrke | 2012-04-10 | 5 | -6/+38 |
| * | | | | fix bug in share lib of calendar | Georg Ehrke | 2012-04-10 | 1 | -1/+1 |
| * | | | | fix view of single shared events | Georg Ehrke | 2012-04-07 | 1 | -4/+3 |
| * | | | | fix path and class name | Georg Ehrke | 2012-04-07 | 1 | -2/+2 |
| * | | | | fix bugs in share lib of calendar | Georg Ehrke | 2012-04-07 | 1 | -6/+10 |
| * | | | | add output functions and access function to app.php of calendar | Georg Ehrke | 2012-04-07 | 1 | -52/+196 |
| * | | | | remove unused code in OC_Calendar_App class | Georg Ehrke | 2012-03-31 | 1 | -5/+0 |
| * | | | | rewrite OC_Calendar_APP class | Georg Ehrke | 2012-03-31 | 1 | -76/+143 |
| * | | | | add public sharing fir calendars and events - add function in Share class | Georg Ehrke | 2012-03-31 | 1 | -0/+23 |
| * | | | | fix group sql generator in calendar's share lib | Georg Ehrke | 2012-03-26 | 1 | -5/+1 |
| * | | | | add read only 'form' for shared events | Georg Ehrke | 2012-03-26 | 2 | -8/+43 |
| * | | | | fix sql command in calendar's share lib | Georg Ehrke | 2012-03-26 | 1 | -3/+3 |
| * | | | | fix merge conflicts | Georg Ehrke | 2012-03-25 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | Merge branch 'master' into calendar_sharing | Georg Ehrke | 2012-03-16 | 1 | -10/+1 |
| |\| | | | | |||||
| * | | | | | fix merge conflicts | Georg Ehrke | 2012-03-03 | 4 | -6/+22 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | fix merge conflicts | Georg Ehrke | 2012-02-25 | 4 | -15/+17 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | add getowner function to OC_Calendar_Object | Georg Ehrke | 2012-02-22 | 1 | -0/+5 |
| * | | | | | | | add is_editing_allowed function to OC_Calendar_Share | Georg Ehrke | 2012-02-22 | 1 | -0/+17 |
| * | | | | | | | clean up sql commands in OC_Calendar_Share | Georg Ehrke | 2012-02-22 | 1 | -19/+35 |
| * | | | | | | | add 'permissions' as a sql condition in allSharedwithuser | Georg Ehrke | 2012-02-21 | 1 | -2/+7 |
| * | | | | | | | fix sql command | Georg Ehrke | 2012-02-18 | 1 | -2/+2 |
| * | | | | | | | show shared calendars | Georg Ehrke | 2012-02-11 | 2 | -5/+20 |
| * | | | | | | | add sharing management for calendars | Georg Ehrke | 2012-02-04 | 1 | -0/+163 |
* | | | | | | | | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-15 | 3 | -16/+3 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Remove useless, unmaintained dav.php | Jakob Sack | 2012-04-15 | 1 | -13/+0 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | reuse OC_L10N objects | Robin Appelman | 2012-04-14 | 1 | -1/+1 |
| * | | | | | | improve flexibility of search providers a bit | Robin Appelman | 2012-04-14 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-13 | 3 | -31/+55 |
|\| | | | | | |||||
| * | | | | | Calendar: Update category list when updating/adding event | Bart Visscher | 2012-04-13 | 2 | -0/+10 |
| * | | | | | Calendar: Document active parameter in allCalendars | Bart Visscher | 2012-04-13 | 1 | -3/+1 |
| * | | | | | Calendar: Fix saving of Categories in an event | Bart Visscher | 2012-04-13 | 1 | -6/+2 |
| * | | | | | Calendar: Implement rescan of Categories | Bart Visscher | 2012-04-13 | 1 | -0/+27 |
| * | | | | | Use the same category input and management as the contacts app | Bart Visscher | 2012-04-12 | 1 | -1/+15 |
| * | | | | | Remove unused function getCategoryOptions from OC_Calendar_Object | Bart Visscher | 2012-04-12 | 1 | -21/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-19 | 4 | -16/+22 |
|\| | | | | |||||
| * | | | | Contacts: small fixes and cleanups | Bart Visscher | 2012-03-07 | 1 | -10/+1 |
| | |_|/ | |/| | | |||||
| * | | | Add /dav.php, a single location bundling all *DAV-operations. | Jakob Sack | 2012-03-02 | 1 | -1/+14 |
| * | | | Search: Change provider registration to class name, for lazy loading of searc... | Bart Visscher | 2012-03-01 | 1 | -3/+2 |
| * | | | Small cleanups | Bart Visscher | 2012-03-01 | 1 | -1/+2 |
| * | | | Calendar: fix bug in creating DTEND from DTSTART | Bart Visscher | 2012-03-01 | 1 | -1/+3 |
| | |/ | |/| | |||||
* / | | replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime | Georg Ehrke | 2012-02-24 | 2 | -10/+10 |
|/ / |