summaryrefslogtreecommitdiffstats
path: root/apps/calendar/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | | | Merge branch 'master' into calendar_importGeorg Ehrke2012-06-294-22/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | fix displaying of eventsGeorg Ehrke2012-06-291-1/+3
| * | | | | | | | | | | | | add some hooks to fix calendar sharingGeorg Ehrke2012-06-291-1/+23
| * | | | | | | | | | | | | fix birthday calendarGeorg Ehrke2012-06-291-9/+9
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Calendar: Missing userid in allCalendars callBart Visscher2012-06-211-1/+1
* | | | | | | | | Only search for VEVENTs.Thomas Tanghus2012-06-211-1/+4
* | | | | | | | | fix a PHP NoticeGeorg Ehrke2012-06-211-0/+3
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | DateTime objects are directly comparableBart Visscher2012-06-201-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-201-3/+3
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | use sanitizeHTML() functionBjoern Schiessle2012-06-201-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Calendar: only run ->expand if the event is repeatingGeorg Ehrke2012-06-191-1/+3
* | | | | | 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
* | | | | | create OC_Calendar_Object::generateStartEndDate functionGeorg Ehrke2012-06-153-44/+22
* | | | | | fix merge conflictsGeorg Ehrke2012-06-153-14/+17
|\| | | | |
| * | | | | Make sure there is a calendar after delete.Thomas Tanghus2012-06-151-0/+4
| * | | | | Agree on argument type (cleaned this time).Thomas Tanghus2012-06-152-4/+4