aboutsummaryrefslogtreecommitdiffstats
path: root/apps/calendar/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'share_api'Michael Gapczynski2012-08-194-12/+204
|\
| * Calendar: update share backend using contacts backend as templateBart Visscher2012-08-101-11/+58
| * Use new sharing API in OC_Calendar_Share::allSharedwithuserBart Visscher2012-08-072-13/+16
| * Add Event share backendBart Visscher2012-08-071-0/+40
| * Initial calendar sharing backendMichael Gapczynski2012-08-071-0/+58
| * Merge branch 'master' into share_apiMichael Gapczynski2012-08-061-2/+2
| |\
| * \ Merge branch 'master' into share_apiMichael Gapczynski2012-07-311-1/+11
| |\ \
| * \ \ Merge branch 'master' into share_apiMichael Gapczynski2012-07-257-6/+439
| |\ \ \
* | | | | fix fail in sql query of isDuplicate method of OC_Calendar_ImportGeorg Ehrke2012-08-171-2/+4
| |_|_|/ |/| | |
* | | | Calendar: remove double html encodingBart Visscher2012-08-031-2/+2
| |_|/ |/| |
* | | Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/ownclou...Georg Ehrke2012-07-271-0/+4
|\ \ \
| * | | Server verhindert beim OSX Client einen DeleteSteven2012-02-131-0/+4
* | | | convert through caldav transmitted rgba calendarcolor to rgbGeorg Ehrke2012-07-261-1/+7
| |_|/ |/| |
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-214-5/+26
|\ \ \
| * | | DRY for getting calendar timezone settingBart Visscher2012-07-213-4/+14
| * | | Added hook for postCreateUser. Probably fix for oc-1265.Thomas Tanghus2012-07-171-1/+12
| | |/ | |/|
* | | comment out some codeGeorg Ehrke2012-07-061-6/+6
* | | some more work on calendar importGeorg Ehrke2012-07-031-6/+35
* | | some work on calendar importGeorg Ehrke2012-07-011-4/+4
* | | use light grey instead of whiteGeorg Ehrke2012-07-011-1/+1
* | | fix doc for OC_Calendar_Calendar::generateTextColor()Georg Ehrke2012-07-011-1/+2
* | | add algorithm to generate the calendar's text colorGeorg Ehrke2012-07-011-1/+18
* | | improvements for dropoimportGeorg Ehrke2012-06-301-4/+16
* | | little fix for importGeorg Ehrke2012-06-301-1/+2
* | | improve dropimportGeorg Ehrke2012-06-301-0/+16
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-06-306-145/+231
|\| |
| * | fix documentation styleGeorg Ehrke2012-06-306-101/+186
| * | fix some docGeorg Ehrke2012-06-301-42/+42
| * | some improvements for calendar exportGeorg Ehrke2012-06-301-2/+3
* | | import works now for dropimportGeorg Ehrke2012-06-301-19/+34
* | | some work on (drop)import)Georg Ehrke2012-06-302-12/+73
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-06-301-0/+93
|\| |
| * | fix merge conflictsGeorg Ehrke2012-06-302-8/+32
| |\ \
| * | | some changes and more doc for OC_Calendar_Export classGeorg Ehrke2012-06-281-19/+55
| * | | fix calendar export for Apple iCal - i hate bloody line endsGeorg Ehrke2012-06-281-0/+3
| * | | fix style of some docGeorg Ehrke2012-06-271-5/+5
| * | | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-272-14/+44
| |\ \ \
| * \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-271-0/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-261-0/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-223-2/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-211-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-204-83/+286
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-201-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-153-14/+18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-101-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-061-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | don't change events timezone and remove the DTSTART value tagGeorg Ehrke2012-06-041-5/+3
| * | | | | | | | | | | | | | proper export for calendar app - doesn't work with apple ical yet - even thou...Georg Ehrke2012-06-031-0/+56
* | | | | | | | | | | | | | | some more work on calendar import classGeorg Ehrke2012-06-301-13/+90