Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: lib/app.php lib/base.php lib/minimizer/css.php lib/minimizer/js.php lib/template.php lib/util.php | ||||
| * | 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 |
| | | | | | | | | | | | | This reverts commit e3b58f6783aa173ceb9c26476ddf01dc570fc5e8. | ||||
| * | | Revert "create OC_Calendar_Object::generateStartEndDate function" | Georg Ehrke | 2012-06-18 | 3 | -22/+44 |
| | | | | | | | | | | | | This reverts commit aa7ce480f4c83f6430eb019cfa172553b5578769. | ||||
| * | | 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 |
| |\| | |||||
| | * | remove a closing php tag in calendar | Georg Ehrke | 2012-06-16 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-06-16 | 1 | -0/+1 |
| |\| | |||||
| | * | Calendar: Write-close session to enable parallel events.php requests | Bart Visscher | 2012-06-16 | 1 | -0/+1 |
| | | | |||||
| * | | create OC_Calendar_Object::generateStartEndDate function | Georg Ehrke | 2012-06-15 | 3 | -44/+22 |
| | | | |||||
| * | | fix merge conflicts | Georg Ehrke | 2012-06-15 | 9 | -42/+59 |
| |\| | |||||
| | * | Make sure there is a calendar after delete. | Thomas Tanghus | 2012-06-15 | 1 | -0/+4 |
| | | | |||||
| | * | Update calendar after delete. | Thomas Tanghus | 2012-06-15 | 1 | -0/+1 |
| | | | |||||
| | * | Only create new calendar when there are none. Fix oc-1007. | Thomas Tanghus | 2012-06-15 | 1 | -2/+4 |
| | | | |||||
| | * | Agree on argument type (cleaned this time). | Thomas Tanghus | 2012-06-15 | 4 | -7/+7 |
| | | | |||||
| | * | Revert "Agree on argument type." | Thomas Tanghus | 2012-06-15 | 4 | -10/+10 |
| | | | | | | | | | | | | This reverts commit 0f6b1be0e6f0cc6ff97c97190c7da67f5fee0294. | ||||
| | * | Agree on argument type. | Thomas Tanghus | 2012-06-15 | 4 | -10/+10 |
| | | | |||||
| | * | No need to find calendar twice. | Thomas Tanghus | 2012-06-15 | 1 | -4/+1 |
| | | | |||||
| | * | Make events show again. | Thomas Tanghus | 2012-06-15 | 1 | -8/+7 |
| | | | |||||
| * | | use DateTime as type of parameter in the functions is_cached_inperiod and ↵ | Georg Ehrke | 2012-06-15 | 2 | -8/+8 |
| | | | | | | | | | | | | get_inperiod | ||||
| * | | change some function names in OC_Calendar_Repeat | Georg Ehrke | 2012-06-15 | 3 | -11/+11 |
| | | |