Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'share_api' | Michael Gapczynski | 2012-08-19 | 4 | -12/+204 |
|\ | |||||
| * | Calendar: update share backend using contacts backend as template | Bart Visscher | 2012-08-10 | 1 | -11/+58 |
| * | Use new sharing API in OC_Calendar_Share::allSharedwithuser | Bart Visscher | 2012-08-07 | 2 | -13/+16 |
| * | Add Event share backend | Bart Visscher | 2012-08-07 | 1 | -0/+40 |
| * | Initial calendar sharing backend | Michael Gapczynski | 2012-08-07 | 1 | -0/+58 |
| * | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-06 | 1 | -2/+2 |
| |\ | |||||
| * \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-31 | 1 | -1/+11 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-25 | 7 | -6/+439 |
| |\ \ \ | |||||
* | | | | | fix fail in sql query of isDuplicate method of OC_Calendar_Import | Georg Ehrke | 2012-08-17 | 1 | -2/+4 |
| |_|_|/ |/| | | | |||||
* | | | | Calendar: remove double html encoding | Bart Visscher | 2012-08-03 | 1 | -2/+2 |
| |_|/ |/| | | |||||
* | | | Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/ownclou... | Georg Ehrke | 2012-07-27 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Server verhindert beim OSX Client einen Delete | Steven | 2012-02-13 | 1 | -0/+4 |
* | | | | convert through caldav transmitted rgba calendarcolor to rgb | Georg Ehrke | 2012-07-26 | 1 | -1/+7 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-21 | 4 | -5/+26 |
|\ \ \ | |||||
| * | | | DRY for getting calendar timezone setting | Bart Visscher | 2012-07-21 | 3 | -4/+14 |
| * | | | Added hook for postCreateUser. Probably fix for oc-1265. | Thomas Tanghus | 2012-07-17 | 1 | -1/+12 |
| | |/ | |/| | |||||
* | | | comment out some code | Georg Ehrke | 2012-07-06 | 1 | -6/+6 |
* | | | some more work on calendar import | Georg Ehrke | 2012-07-03 | 1 | -6/+35 |
* | | | some work on calendar import | Georg Ehrke | 2012-07-01 | 1 | -4/+4 |
* | | | use light grey instead of white | Georg Ehrke | 2012-07-01 | 1 | -1/+1 |
* | | | fix doc for OC_Calendar_Calendar::generateTextColor() | Georg Ehrke | 2012-07-01 | 1 | -1/+2 |
* | | | add algorithm to generate the calendar's text color | Georg Ehrke | 2012-07-01 | 1 | -1/+18 |
* | | | improvements for dropoimport | Georg Ehrke | 2012-06-30 | 1 | -4/+16 |
* | | | little fix for import | Georg Ehrke | 2012-06-30 | 1 | -1/+2 |
* | | | improve dropimport | Georg Ehrke | 2012-06-30 | 1 | -0/+16 |
* | | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-06-30 | 6 | -145/+231 |
|\| | | |||||
| * | | fix documentation style | Georg Ehrke | 2012-06-30 | 6 | -101/+186 |
| * | | fix some doc | Georg Ehrke | 2012-06-30 | 1 | -42/+42 |
| * | | some improvements for calendar export | Georg Ehrke | 2012-06-30 | 1 | -2/+3 |
* | | | import works now for dropimport | Georg Ehrke | 2012-06-30 | 1 | -19/+34 |
* | | | some work on (drop)import) | Georg Ehrke | 2012-06-30 | 2 | -12/+73 |
* | | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-06-30 | 1 | -0/+93 |
|\| | | |||||
| * | | fix merge conflicts | Georg Ehrke | 2012-06-30 | 2 | -8/+32 |
| |\ \ | |||||
| * | | | some changes and more doc for OC_Calendar_Export class | Georg Ehrke | 2012-06-28 | 1 | -19/+55 |
| * | | | fix calendar export for Apple iCal - i hate bloody line ends | Georg Ehrke | 2012-06-28 | 1 | -0/+3 |
| * | | | fix style of some doc | Georg Ehrke | 2012-06-27 | 1 | -5/+5 |
| * | | | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-27 | 2 | -14/+44 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-27 | 1 | -0/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-26 | 1 | -0/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-22 | 3 | -2/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-20 | 4 | -83/+286 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-20 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-15 | 3 | -14/+18 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-13 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-10 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-06 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | don't change events timezone and remove the DTSTART value tag | Georg Ehrke | 2012-06-04 | 1 | -5/+3 |
| * | | | | | | | | | | | | | | proper export for calendar app - doesn't work with apple ical yet - even thou... | Georg Ehrke | 2012-06-03 | 1 | -0/+56 |
* | | | | | | | | | | | | | | | some more work on calendar import class | Georg Ehrke | 2012-06-30 | 1 | -13/+90 |