Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-22 | 10 | -17/+57 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-21 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-20 | 13 | -91/+416 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-20 | 3 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-16 | 25 | -43/+25 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-16 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-16 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-15 | 9 | -42/+60 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-13 | 7 | -15/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-13 | 3 | -26/+18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-10 | 16 | -34/+41 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-08 | 2 | -37/+42 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-06 | 22 | -78/+711 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | don't change events timezone and remove the DTSTART value tag | Georg Ehrke | 2012-06-04 | 1 | -5/+3 | |
| | * | | | | | | | | | | | | | | | | | | | proper export for calendar app - doesn't work with apple ical yet - even thou... | Georg Ehrke | 2012-06-03 | 3 | -14/+62 | |
| * | | | | | | | | | | | | | | | | | | | | some more work on calendar import class | Georg Ehrke | 2012-06-30 | 1 | -13/+90 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-06-29 | 6 | -23/+82 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | fix displaying of events | Georg Ehrke | 2012-06-29 | 1 | -1/+3 | |
| | * | | | | | | | | | | | | | | | | | | | add some hooks to fix calendar sharing | Georg Ehrke | 2012-06-29 | 2 | -1/+28 | |
| | * | | | | | | | | | | | | | | | | | | | fix birthday calendar | Georg Ehrke | 2012-06-29 | 1 | -9/+9 | |
| | * | | | | | | | | | | | | | | | | | | | pass progresskey the correct way during calender import | Robin Appelman | 2012-06-29 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | move some documentation to the right place | Georg Ehrke | 2012-06-27 | 2 | -13/+20 | |
| | * | | | | | | | | | | | | | | | | | | add merge calendar function and add some documentation to OC_Calendar_Calendar | Georg Ehrke | 2012-06-27 | 1 | -1/+24 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | ||||||
| * / | | | | | | | | | | | | | | | | | some work on OC_Calendar_Import | Georg Ehrke | 2012-06-29 | 1 | -0/+139 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | / / | add OC_Calendar_Object::createUID() | Georg Ehrke | 2012-06-26 | 1 | -0/+8 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Also load categories from VJOURNAL. | Thomas Tanghus | 2012-06-24 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | | another fix for oc-1044 | Georg Ehrke | 2012-06-24 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | date don't change correctly in the view list (bug #973) fixed | Bjoern Schiessle | 2012-06-22 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | Calendar: Fix caldav url encoding | Bart Visscher | 2012-06-21 | 2 | -3/+2 | |
| * | | | | | | | | | | | | | | | Calendar: convert choosecalendar.rowfields template from plain php to html+php | Bart Visscher | 2012-06-21 | 1 | -8/+21 | |
| * | | | | | | | | | | | | | | | Calendar: Missing userid in allCalendars call | Bart Visscher | 2012-06-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Calendar: Fix missing template parameter 'shared' for new and update calendar | Bart Visscher | 2012-06-21 | 2 | -2/+14 | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-21 | 1 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Only search for VEVENTs. | Thomas Tanghus | 2012-06-21 | 1 | -1/+4 | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-21 | 42 | -161/+482 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix calendar | Georg Ehrke | 2012-06-21 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | fix a PHP Notice | Georg Ehrke | 2012-06-21 | 1 | -0/+3 | |
| | * | | | | | | | | | | | | | | | make edit event form work with DateTime Property UTC | Georg Ehrke | 2012-06-21 | 1 | -0/+8 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | DateTime objects are directly comparable | Bart Visscher | 2012-06-20 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-06-20 | 3 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | use sanitizeHTML() function | Bjoern Schiessle | 2012-06-20 | 3 | -5/+5 | |
| | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Calendar: only run ->expand if the event is repeating | Georg Ehrke | 2012-06-19 | 1 | -1/+3 | |
| | * | | | | | | | | | | | | Calendar: js fix | Georg Ehrke | 2012-06-19 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | Calendar: fix modifying of end DateTime object | Georg Ehrke | 2012-06-19 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | some little fixes for repeating events caching | Georg Ehrke | 2012-06-18 | 3 | -10/+12 | |
| | * | | | | | | | | | | | | Revert "Revert "create OC_Calendar_Object::generateStartEndDate function"" | Georg Ehrke | 2012-06-18 | 3 | -44/+22 | |
| | * | | | | | | | | | | | | Revert "create OC_Calendar_Object::generateStartEndDate function" | Georg Ehrke | 2012-06-18 | 3 | -22/+44 | |
| | * | | | | | | | | | | | | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-06-16 | 25 | -43/+25 | |
| | |\| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | remove a lot of closing php tags and empty lines at a file's end in calendar app | Georg Ehrke | 2012-06-16 | 25 | -43/+25 | |
| | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-06-16 | 1 | -2/+1 | |
| | |\| | | | | | | | | | |