summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-05-07125-667/+933
|\
| * whitespace correction in webfinger.phpMichiel de Jong2012-05-071-3/+3
| * require base lib and deal with malformed user addresses in webfinger.phpMichiel de Jong2012-05-071-5/+7
| * prevent xss in webfingerMichiel de Jong2012-05-071-1/+1
| * Fix typo.Thomas Tanghus2012-05-071-1/+1
| * Code cleanup.Thomas Tanghus2012-05-071-49/+9
| * Remove manual file cache insertions of shared files, update mtime of shared f...Michael Gapczynski2012-05-061-9/+5
| * Fix updateFolder() in OC_FileCacheMichael Gapczynski2012-05-061-1/+1
| * Fix feedback for sharing errorsMichael Gapczynski2012-05-062-5/+5
| * Provide feedback when user creation failsMichael Gapczynski2012-05-063-8/+10
| * Add php-pdo to soft depend checkBrice Maron2012-05-061-0/+6
| * Add php-xml as dependency for core fix oc-364Brice Maron2012-05-061-0/+6
| * fix an XSS bugFrank Karlitschek2012-05-061-1/+1
| * ported the oc_template classFrank Karlitschek2012-05-0682-140/+184
| * some more documentation cleanups. much more is needed.Frank Karlitschek2012-05-067-78/+79
| * first part of documentation update. lot´s more to comeFrank Karlitschek2012-05-061-47/+47
| * Calendar: Fixed image paths.Thomas Tanghus2012-05-061-5/+5
| * Contacts: Re-added some styling that got lost in a revert.Thomas Tanghus2012-05-061-1/+2
| * Correct wrong DB quotes for calendar share functionsBrice Maron2012-05-061-8/+8
| * Merge commit 'refs/merge-requests/109' of git://gitorious.org/owncloud/ownclo...Daniel2012-05-062-3/+3
| |\
| | * fix bug where users could use wildcards in username to loginDaniel2012-04-152-3/+3
| * | Contacts: Fix for Android browser again, again.Thomas Tanghus2012-05-062-8/+8
| * | Contacts: Resized Add button. Now how do I add a gradient? ;-)Thomas Tanghus2012-05-062-6/+32
| * | Revert Android positioning 'fix'.Thomas Tanghus2012-05-061-81/+81
| * | Revert "Contacts: Fix for leftcontent positioning in Android browser."Thomas Tanghus2012-05-063-18/+18
| * | Fixed escaping of filename when determining MIME typeJernej Virag2012-04-251-2/+2
| * | Forgot to fix one file...Thomas Tanghus2012-05-061-81/+81
| * | Calendar: Fix calendar export linkBart Visscher2012-05-061-2/+2
| * | Contacts: Fix for leftcontent positioning in Android browser.Thomas Tanghus2012-05-063-18/+18
| * | Contacts: Removed redundant styles.Thomas Tanghus2012-05-061-4/+1
| * | added a nice API to get the installes Apps with names, urls and icon from the...Frank Karlitschek2012-05-056-1/+62
| * | Add back removed groups to the select form correctlyMichael Gapczynski2012-05-051-4/+10
| * | Calendar: fix return of insert idBart Visscher2012-05-051-2/+4
| * | Fix loading by apptype in webdavBart Visscher2012-05-053-9/+3
| * | Refactor sharing UI; bug fixes, code clean-up, and more efficient with less a...Michael Gapczynski2012-05-059-279/+440
| * | Remove blind effect for email private link in drop downMichael Gapczynski2012-05-051-4/+4
* | | make carddav work with remote.phpGeorg Ehrke2012-05-071-1/+1
* | | fix remote.phpGeorg Ehrke2012-05-071-2/+2
* | | Working remote.php with webdav and caldavBart Visscher2012-05-064-6/+11
* | | push changesGeorg Ehrke2012-05-057-23/+16
|/ /
* | fix writing of webdav.phpGeorg Ehrke2012-05-051-1/+1
* | fix path of webdavGeorg Ehrke2012-05-051-1/+1
* | fix pathes for cal andcarddavGeorg Ehrke2012-05-052-3/+3
* | remove debug messagesGeorg Ehrke2012-05-052-2/+0
* | Tasks: Fix addtask for <5.4 php versionBart Visscher2012-05-051-1/+2
* | fix writing in remote folderGeorg Ehrke2012-05-059-23/+9
* | Merge branch 'tasks' for Tasks appBart Visscher2012-05-0527-2/+1483
|\ \
| * | Tasks: Fix add task actionBart Visscher2012-05-051-1/+1
| * | Tasks: Some stylingBart Visscher2012-05-041-3/+5
| * | Tasks: Really correct iconBart Visscher2012-05-042-9/+14