| Commit message (Expand) | Author | Age | Files | Lines |
* | fix merge conflicts | Georg Ehrke | 2012-04-15 | 2 | -6/+22 |
|\ |
|
| * | 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 |
* | | fix class name | Georg Ehrke | 2012-04-13 | 1 | -1/+1 |
* | | fix merge conflicts | Georg Ehrke | 2012-04-13 | 3 | -41/+73 |
|\| |
|
| * | 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 |
* | | 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 |
|\| |
|
| * | Contacts: small fixes and cleanups | Bart Visscher | 2012-03-07 | 1 | -10/+1 |
* | | fix merge conflicts | Georg Ehrke | 2012-03-03 | 4 | -6/+22 |
|\| |
|
| * | 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 |
* | | fix merge conflicts | Georg Ehrke | 2012-02-25 | 4 | -15/+17 |
|\| |
|
| * | Calendar: Correct calendarcolor format for ical color property | Bart Visscher | 2012-02-21 | 1 | -12/+12 |
| * | apps/calendar: update ctag after deleteFromDAVData | Florian Pritz | 2012-02-19 | 1 | -0/+1 |
| * | Calendar: optimize sending calendar events, also enabled caching of result | Bart Visscher | 2012-02-17 | 1 | -0/+1 |
| * | Fixup use of OC_Helper::linkTo function | Bart Visscher | 2012-02-17 | 1 | -1/+1 |
* | | 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 |
|/ |
|
* | change description of the changed colors (calendar) | Georg Ehrke | 2012-01-15 | 1 | -1/+1 |
* | change calendar colors | Georg Ehrke | 2012-01-15 | 1 | -2/+2 |
* | fix old calendar name and color not being preserved when editing a calendar | Robin Appelman | 2012-01-11 | 1 | -2/+2 |
* | improve search function | Georg Ehrke | 2012-01-06 | 1 | -3/+24 |