summaryrefslogtreecommitdiffstats
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-1349-89/+1219
|\
| * Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/ownclo...Michael Gapczynski2012-06-1323-54/+73
| |\
| | * Removed unecessary sanitizationLukas Reschke2012-06-111-1/+1
| | * Removed double sanitizationLukas Reschke2012-06-115-11/+11
| | * Fix double sanitizationLukas Reschke2012-06-111-1/+1
| | * Fixes a issue with the logLukas Reschke2012-06-111-2/+2
| | * Removed some unessecary sanitizationsLukas Reschke2012-06-115-8/+8
| | * Make some apps compatibleLukas Reschke2012-06-1117-35/+64
| | * Check for stringLukas Reschke2012-06-111-14/+2
| | * Some updates...Lukas Reschke2012-06-111-14/+28
| | * Handling arraysLukas Reschke2012-06-111-1/+16
| | * RevertLukas Reschke2012-06-1116-111/+78
| | * Settings...Lukas Reschke2012-06-115-16/+16
| | * First try of implementing assignHTMLLukas Reschke2012-06-1111-59/+78
| * | Add support for mounting Google Drive in external storage UIMichael Gapczynski2012-06-137-2/+1059
| * | Remove check for encryption.Thomas Tanghus2012-06-131-5/+0
| * | Remove debug statements.Thomas Tanghus2012-06-132-19/+0
| * | Contacts: implemented CSRF prevention.Thomas Tanghus2012-06-1314-6/+52
| * | Added JSON methods for CSRF prevention. Make request token accessible from te...Thomas Tanghus2012-06-135-22/+54
| * | fix time callFrank Karlitschek2012-06-131-1/+1
| * | urlencode link fort password reset (bug #970)Bjoern Schiessle2012-06-131-1/+1
* | | fix merge conflictsGeorg Ehrke2012-06-135-8/+15
|\| |
| * | Fix incorrect creation of filesystem for user@group in data folder during sharesMichael Gapczynski2012-06-121-4/+4
| * | check for view before trying to invoke method on objectBartek Przybylski2012-06-131-1/+1
| * | fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987Thomas Mueller2012-06-121-1/+5
| * | Create directory for mount point if it doesn't already existMichael Gapczynski2012-06-121-0/+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
* | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-126-43/+155
|\| |
| * | Add support for mounting Dropbox in external storage UIMichael Gapczynski2012-06-125-42/+150
| * | Label the delete operation "unshare" for files in the "Shared" folder to reduceBjoern Schiessle2012-06-121-1/+5
* | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-1220-716/+4554
|\| |
| * | block slashes only for new files and new folders but not for file upload from...Bjoern Schiessle2012-06-121-1/+1
| * | Contacts: Final (for now) fix to encoding probs on import.Thomas Tanghus2012-06-121-1/+2
| * | committed patch (bug #967) to add missing translations for file actionsBjoern Schiessle2012-06-121-2/+2
| * | applied patch provided by bug #966 to fix broken user specific quota settingsBjoern Schiessle2012-06-123-48/+76
| * | PDF.JS updated, compatibility.js added for browser support, should fix: oc-395Thomas Mueller2012-06-128-659/+4465
| * | utf8 in der DB configMarco B2012-06-115-5/+5
| * | Add .vimrc to .gitignore.Thomas Tanghus2012-06-111-0/+3
* | | automatic cache repeating events after an updateGeorg Ehrke2012-06-121-0/+5
* | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-116-37/+30
|\| |
| * | Fix js for missing address fields.Thomas Tanghus2012-06-111-6/+6
| * | Quick fix for index errors when not importing from files.Thomas Tanghus2012-06-111-1/+1
| * | Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc...Thomas Tanghus2012-06-111-2/+2
| * | Contacts: Fix encoding errors, import errors, developer headache, paint cute ...Thomas Tanghus2012-06-111-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 00:48:07 +0000