summaryrefslogtreecommitdiffstats
path: root/apps/calendar
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2210-17/+57
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-211-1/+1
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2013-91/+416
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-203-5/+5
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1625-43/+25
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-161-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-161-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-159-42/+60
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-137-15/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-133-26/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1016-34/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-082-37/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-0622-78/+711
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | 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-033-14/+62
| * | | | | | | | | | | | | | | | | | | | some more work on calendar import classGeorg Ehrke2012-06-301-13/+90
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into calendar_importGeorg Ehrke2012-06-296-23/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | fix displaying of eventsGeorg Ehrke2012-06-291-1/+3
| | * | | | | | | | | | | | | | | | | | | add some hooks to fix calendar sharingGeorg Ehrke2012-06-292-1/+28
| | * | | | | | | | | | | | | | | | | | | fix birthday calendarGeorg Ehrke2012-06-291-9/+9
| | * | | | | | | | | | | | | | | | | | | pass progresskey the correct way during calender importRobin Appelman2012-06-291-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | 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
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |
| * / | | | | | | | | | | | | | | | | some work on OC_Calendar_ImportGeorg Ehrke2012-06-291-0/+139
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | / / 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
| | |\| | | | | | | | | |