summaryrefslogtreecommitdiffstats
path: root/apps/calendar
Commit message (Expand)AuthorAgeFilesLines
...
| * | xss vulnerability fixedBjoern Schiessle2012-06-051-3/+3
| |/
* | add statusGeorg Ehrke2012-06-011-0/+0
* | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-014-30/+17
|\|
| * fix potential XSSGeorg Ehrke2012-05-312-2/+2
| * Remove OC_App::register functionBart Visscher2012-05-311-4/+0
| * Calendar: small cleanup of import progress writingBart Visscher2012-05-311-24/+15
* | some work for repeating events cachingGeorg Ehrke2012-06-011-7/+27
* | a bit of work for repeating events cachingGeorg Ehrke2012-05-291-3/+12
* | add button to clear calendar's cacheGeorg Ehrke2012-05-294-1/+20
* | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-05-293-10/+7
|\|
| * fix statusGeorg Ehrke2012-05-291-9/+5
| * Correct typo in last_insert_id for calendar and pg fix #oc-731Brice Maron2012-05-281-1/+1
| * add urlencode for caldav linkGeorg Ehrke2012-05-281-0/+1
* | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-05-261-3/+4
|\|
| * fix share for users with a point within their nameGeorg Ehrke2012-05-261-3/+4
* | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-05-254-3/+122
|\|
| * Merge branch 'calendar_dropimport'Georg Ehrke2012-05-192-0/+119
| |\
| | * Merge branch 'master' into calendar_dropimportGeorg Ehrke2012-05-1779-35/+940
| | |\
| | * | some little js fixes for drop importGeorg Ehrke2012-05-131-2/+2
| | * | Merge branch 'master' into calendar_dropimportGeorg Ehrke2012-05-134-6/+7
| | |\ \
| | * | | add first version of drop importGeorg Ehrke2012-05-132-0/+119
| * | | | fix for calendarGeorg Ehrke2012-05-191-2/+1
| * | | | mark the apps as part of the shipped package and increase the requirement to ...Frank Karlitschek2012-05-181-1/+2
| | |_|/ | |/| |
* | | | some changes in calendar repeat classGeorg Ehrke2012-05-181-2/+18
* | | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-05-1779-35/+940
|\| | |
| * | | fix paths to images and set height for calendar management dialogGeorg Ehrke2012-05-173-4/+5
| * | | update translationsRobin Appelman2012-05-178-8/+366
| * | | add caldav and carddav files in their old place for backward compatibility - ...Georg Ehrke2012-05-162-0/+10
| * | | removing executable bit - againThomas Mueller2012-05-1552-0/+0
| * | | better user permission check for files in ajax/calendar/Georg Ehrke2012-05-144-4/+20
| * | | some fixes for calendar's export.phpGeorg Ehrke2012-05-141-0/+8
| * | | check user permissions in calendar's changepermission.phpGeorg Ehrke2012-05-141-0/+8
| * | | check user permissions in calendar's unshare.phpGeorg Ehrke2012-05-141-0/+8
| * | | selective app loading for remote/publicRobin Appelman2012-05-141-0/+4
| * | | add post user delete hook for calendar sharingGeorg Ehrke2012-05-132-0/+19
| * | | update translationsRobin Appelman2012-05-1318-20/+493
| | |/ | |/|
* | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-05-134-6/+7
|\| |
| * | hide share tab for new events, because you can't share an event that haven't ...Georg Ehrke2012-05-131-2/+2
| * | fix another php noticeGeorg Ehrke2012-05-131-0/+1
| * | fix another php noticeGeorg Ehrke2012-05-131-3/+3
| * | fix php notice and displaying of eventsGeorg Ehrke2012-05-131-1/+1
| |/
* | some changes for calendar repeat classGeorg Ehrke2012-05-121-5/+13
* | add functions get cached events in a specific time periodGeorg Ehrke2012-05-121-1/+9
* | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-05-1299-1056/+1991
|\|
| * load remote and public paths from info.xml during upgrade instead of setting ...Robin Appelman2012-05-113-3/+9
| * Correct undef variable mistake from prev commitBrice Maron2012-05-101-2/+3
| * Correct calendar loading when calendar are from hooks. fix oc-619Brice Maron2012-05-102-9/+16
| * revert 000d7ba97535f470f30be44e02140401b24b43e2Georg Ehrke2012-05-091-1/+1
| * fix bug in events.phpGeorg Ehrke2012-05-091-1/+1
| * update translationsRobin Appelman2012-05-0943-732/+1619