summaryrefslogtreecommitdiffstats
path: root/apps/calendar
Commit message (Expand)AuthorAgeFilesLines
* fix for previous commitGeorg Ehrke2012-06-281-0/+1
* use OC_Calendar_Export for publicly shared calendarsGeorg Ehrke2012-06-281-13/+21
* Calendar Export: replace spaces with dashes in the name of the calendar / eventGeorg Ehrke2012-06-281-2/+2
* 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
|\
| * 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
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-271-0/+8
|\|
| * add OC_Calendar_Object::createUID()Georg Ehrke2012-06-261-0/+8
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-262-1/+4
|\|
| * Also load categories from VJOURNAL.Thomas Tanghus2012-06-241-0/+3
| * another fix for oc-1044Georg Ehrke2012-06-241-1/+1
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2210-17/+57
|\|
| * 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
| * | Merge branch 'master' into multi_app_dirBrice Maron2012-06-1425-93/+107
| |\ \
| * \ \ Merge branch 'master' into multi_app_dirBrice Maron2012-06-071-34/+39
| |\ \ \
| * | | | Correct remote and public, and last occurence of OC::Brice Maron2012-06-061-2/+2
* | | | | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-211-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | DateTime objects are directly comparableBart Visscher2012-06-201-1/+1
* | | | | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2013-91/+416
|\| | | |
| * | | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-161-2/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-161-0/+1
| |\ \ \ \ \ \ \
| * | | | | | | | create OC_Calendar_Object::generateStartEndDate functionGeorg Ehrke2012-06-153-44/+22
| * | | | | | | | fix merge conflictsGeorg Ehrke2012-06-159-42/+59
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \