summaryrefslogtreecommitdiffstats
path: root/apps/calendar
Commit message (Expand)AuthorAgeFilesLines
* move some documentation to the right placeGeorg Ehrke2012-06-272-13/+20
* add merge calendar function and add some documentation to OC_Calendar_CalendarGeorg Ehrke2012-06-271-1/+24
* add OC_Calendar_Object::createUID()Georg Ehrke2012-06-261-0/+8
* Also load categories from VJOURNAL.Thomas Tanghus2012-06-241-0/+3
* another fix for oc-1044Georg Ehrke2012-06-241-1/+1
* date don't change correctly in the view list (bug #973) fixedBjoern Schiessle2012-06-221-0/+2
* Calendar: Fix caldav url encodingBart Visscher2012-06-212-3/+2
* Calendar: convert choosecalendar.rowfields template from plain php to html+phpBart Visscher2012-06-211-8/+21
* Calendar: Missing userid in allCalendars callBart Visscher2012-06-211-1/+1
* Calendar: Fix missing template parameter 'shared' for new and update calendarBart Visscher2012-06-212-2/+14
* Merge branch 'master' into multi_app_dirBrice Maron2012-06-211-1/+4
|\
| * Only search for VEVENTs.Thomas Tanghus2012-06-211-1/+4
* | Merge branch 'master' into multi_app_dirBrice Maron2012-06-2142-161/+482
|\|
| * fix calendarGeorg Ehrke2012-06-211-1/+1
| * fix a PHP NoticeGeorg Ehrke2012-06-211-0/+3
| * make edit event form work with DateTime Property UTCGeorg Ehrke2012-06-211-0/+8
| * DateTime objects are directly comparableBart Visscher2012-06-201-1/+1
| * Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-203-5/+5
| |\
| | * use sanitizeHTML() functionBjoern Schiessle2012-06-203-5/+5
| * | Calendar: only run ->expand if the event is repeatingGeorg Ehrke2012-06-191-1/+3
| * | Calendar: js fixGeorg Ehrke2012-06-191-1/+1
| * | Calendar: fix modifying of end DateTime objectGeorg Ehrke2012-06-191-1/+1
| * | some little fixes for repeating events cachingGeorg Ehrke2012-06-183-10/+12
| * | Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""Georg Ehrke2012-06-183-44/+22
| * | Revert "create OC_Calendar_Object::generateStartEndDate function"Georg Ehrke2012-06-183-22/+44
| * | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-1625-43/+25
| |\|
| | * remove a lot of closing php tags and empty lines at a file's end in calendar appGeorg Ehrke2012-06-1625-43/+25
| * | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-161-2/+1
| |\|
| | * remove a closing php tag in calendarGeorg Ehrke2012-06-161-2/+1
| * | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-161-0/+1
| |\|
| | * Calendar: Write-close session to enable parallel events.php requestsBart Visscher2012-06-161-0/+1
| * | create OC_Calendar_Object::generateStartEndDate functionGeorg Ehrke2012-06-153-44/+22
| * | fix merge conflictsGeorg Ehrke2012-06-159-42/+59
| |\|
| | * Make sure there is a calendar after delete.Thomas Tanghus2012-06-151-0/+4
| | * Update calendar after delete.Thomas Tanghus2012-06-151-0/+1
| | * Only create new calendar when there are none. Fix oc-1007.Thomas Tanghus2012-06-151-2/+4
| | * Agree on argument type (cleaned this time).Thomas Tanghus2012-06-154-7/+7
| | * Revert "Agree on argument type."Thomas Tanghus2012-06-154-10/+10
| | * Agree on argument type.Thomas Tanghus2012-06-154-10/+10
| | * No need to find calendar twice.Thomas Tanghus2012-06-151-4/+1
| | * Make events show again.Thomas Tanghus2012-06-151-8/+7
| * | use DateTime as type of parameter in the functions is_cached_inperiod and get...Georg Ehrke2012-06-152-8/+8
| * | change some function names in OC_Calendar_RepeatGeorg Ehrke2012-06-153-11/+11
| * | use easier parseable date to init datetimeGeorg Ehrke2012-06-151-2/+2
| * | fix generateEventOutput for calendar hookGeorg Ehrke2012-06-151-5/+2
| * | don't clean and cache calendar on every updateGeorg Ehrke2012-06-151-4/+6
| * | fix merge conflictsGeorg Ehrke2012-06-136-13/+13
| |\ \
| * \ \ fix merge conflictsGeorg Ehrke2012-06-132-3/+3
| |\ \ \
| * | | | automatic cache repeating events after an updateGeorg Ehrke2012-06-121-0/+5
| * | | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-111-23/+15
| |\ \ \ \