summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-06-1334-42/+164
|\
| * Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/ownclo...Michael Gapczynski2012-06-1316-31/+31
| |\
| | * Removed unecessary sanitizationLukas Reschke2012-06-111-1/+1
| | * Removed double sanitizationLukas Reschke2012-06-115-11/+11
| | * Fix double sanitizationLukas Reschke2012-06-111-1/+1
| | * Removed some unessecary sanitizationsLukas Reschke2012-06-114-7/+7
| | * Make some apps compatibleLukas Reschke2012-06-119-18/+29
| | * RevertLukas Reschke2012-06-119-44/+44
| | * First try of implementing assignHTMLLukas Reschke2012-06-1110-45/+45
| * | Add support for mounting Google Drive in external storage UIMichael Gapczynski2012-06-134-2/+102
| * | 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
* | | fix merge conflictsGeorg Ehrke2012-06-133-7/+7
|\| |
| * | Fix incorrect creation of filesystem for user@group in data folder during sharesMichael Gapczynski2012-06-121-4/+4
| * | 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-1216-668/+4475
|\| |
| * | 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
| * | 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
* | | 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
| * | Tasks: Fix resizing of the content partBart Visscher2012-06-111-2/+5
| * | Gallery: remove extra include of lib/base.phpBart Visscher2012-06-111-2/+0
| * | 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
* | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-113-3/+5
|\| |
| * | replace "=0D=0A" (\r\n) with a simple "\n" in vards during importBjoern Schiessle2012-06-111-2/+2
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-112-1/+3
| |\ \
| | * | LDAP: offer config option for Group Display Name attributeArthur Schiwon2012-06-112-1/+3
| * | | make sure that contact data are always utf8 encoded to avoid encoding problemsBjoern Schiessle2012-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
* | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-112-3/+12
|\| |
| * | Contacts: Fix NOTE also on add, not just save.Thomas Tanghus2012-06-111-2/+11
| |/
| * ldap: check array for emptiness, not nullnessArthur Schiwon2012-06-111-1/+1
* | increase version number of calendarGeorg Ehrke2012-06-111-1/+1
* | some fixes for repeating events cachingGeorg Ehrke2012-06-111-3/+4