summaryrefslogtreecommitdiffstats
path: root/apps/calendar
Commit message (Expand)AuthorAgeFilesLines
* use DateTime as type of parameter in the functions is_cached_inperiod and get...Georg Ehrke2012-06-152-8/+8
* change some function names in OC_Calendar_RepeatGeorg Ehrke2012-06-153-11/+11
* use easier parseable date to init datetimeGeorg Ehrke2012-06-151-2/+2
* fix generateEventOutput for calendar hookGeorg Ehrke2012-06-151-5/+2
* don't clean and cache calendar on every updateGeorg Ehrke2012-06-151-4/+6
* fix merge conflictsGeorg Ehrke2012-06-136-13/+13
|\
| * Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/ownclo...Michael Gapczynski2012-06-137-15/+15
| |\
| | * Removed double sanitizationLukas Reschke2012-06-115-11/+11
| | * Fix double sanitizationLukas Reschke2012-06-111-1/+1
| | * Removed some unessecary sanitizationsLukas Reschke2012-06-111-1/+1
| | * Make some apps compatibleLukas Reschke2012-06-111-2/+2
| | * RevertLukas Reschke2012-06-111-3/+3
| | * First try of implementing assignHTMLLukas Reschke2012-06-111-3/+3
* | | fix merge conflictsGeorg Ehrke2012-06-132-3/+3
|\| |
| * | increase version of calendar app to force db upgradeGeorg Ehrke2012-06-121-1/+1
| * | increase possible size of uri in database - fix oc-140Georg Ehrke2012-06-121-2/+2
* | | automatic cache repeating events after an updateGeorg Ehrke2012-06-121-0/+5
* | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-111-23/+15
|\| |
| * | Calendar: remove unused markup from #controlsBart Visscher2012-06-111-23/+15
| |/
* | add some information about repeating events caching on personal settings pageGeorg Ehrke2012-06-113-3/+46
* | fix a bug in OC_Calendar_RepeatGeorg Ehrke2012-06-111-2/+2
* | connect OC_Calendar_repeat to events.phpGeorg Ehrke2012-06-111-49/+66
* | add function isrepeating to OC_Calendar_Object class and change OC_Calendar_O...Georg Ehrke2012-06-111-1/+6
* | fix bug in OC_Calendar_RepeatGeorg Ehrke2012-06-111-3/+18
* | increase version number of calendarGeorg Ehrke2012-06-111-1/+1
* | some fixes for repeating events cachingGeorg Ehrke2012-06-111-3/+4
* | add hooks to connect calendar / event changes with OC_Calendar_RepeatGeorg Ehrke2012-06-111-0/+5
* | modify hooks in OC_Calendar_CalendarGeorg Ehrke2012-06-111-4/+4
* | modify hooks in OC_Calendar_ObjectGeorg Ehrke2012-06-111-7/+7
* | remove insert idGeorg Ehrke2012-06-111-1/+0
* | some work on repeating events caching - basic class should work now :)Georg Ehrke2012-06-111-4/+24
* | use native sabredav functions to generate repeating eventsGeorg Ehrke2012-06-111-54/+25
* | remove include command for whenGeorg Ehrke2012-06-101-4/+0
* | fix merge conflictsGeorg Ehrke2012-06-1016-34/+41
|\|
| * fix another XSSGeorg Ehrke2012-06-091-0/+3
| * fix XSS in CalendarGeorg Ehrke2012-06-091-1/+1
| * increase height of event dialogGeorg Ehrke2012-06-091-0/+1
| * fix creation of monthly repeated eventsGeorg Ehrke2012-06-091-0/+3
| * make use of post instead of getGeorg Ehrke2012-06-0913-33/+33
* | add hooks for eventsGeorg Ehrke2012-06-091-2/+8
* | add hooks for calendarsGeorg Ehrke2012-06-091-2/+11
* | some more work on repeating events cachingGeorg Ehrke2012-06-091-7/+48
* | some work on repeating events cachingGeorg Ehrke2012-06-082-4/+95
* | fix merge conflictsGeorg Ehrke2012-06-082-36/+41
|\|
| * Calendar: Added more explicit sync links and fixed indentation.Thomas Tanghus2012-06-071-34/+39
| * Corrected typos.Thomas Tanghus2012-06-061-3/+3
* | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-0622-78/+711
|\|
| * update translationsRobin Appelman2012-06-0617-57/+690
| * Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-054-18/+18
| |\
| | * Calendar & Contacts: Store import progress in OC_CacheBart Visscher2012-06-044-18/+18