summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correct sample configBrice Maron2012-06-141-8/+4
* Merge branch 'master' into multi_app_dirBrice Maron2012-06-14255-1534/+29767
|\
| * Forgot $ sign for variableMichael Gapczynski2012-06-141-1/+1
| * Revert "Fix a counting mistake"Michael Gapczynski2012-06-141-1/+1
| * first load compatibility.jsThomas Mueller2012-06-141-2/+3
| * fix javascript errorThomas Mueller2012-06-141-0/+4
| * reverting 8c7fa15aaf98e31646e4306e7819d1d2b725a7e1, differs between OC3 and 4Arthur Schiwon2012-06-141-2/+2
| * Check for '\' as well when searching for parent folders, because Windows retu...Michael Gapczynski2012-06-141-1/+1
| * Contacts: Fixes for CSRF.Thomas Tanghus2012-06-141-2/+2
| * Make requesttoken global.Thomas Tanghus2012-06-141-1/+1
| * fixed bug #996: first picture in folder is repeated in the last position beha...Bjoern Schiessle2012-06-141-4/+2
| * prevent xss attacks also if some javascript ends up in the alt-tagBjoern Schiessle2012-06-142-2/+3
| * Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-143-52/+48
| |\
| | * White-space fix.Thomas Tanghus2012-06-142-49/+45
| | * Don't add slash if it's there already.Thomas Tanghus2012-06-141-1/+1
| | * Use the right csrf token.Thomas Tanghus2012-06-141-2/+2
| * | fixed xss vulnerability in un-packed version of jquery.fancybox and repack itBjoern Schiessle2012-06-142-794/+3
| |/
| * debugging output removedBjoern Schiessle2012-06-141-1/+0
| * xss vulnerability fixed for fancybox image viewerBjoern Schiessle2012-06-142-29/+777
| * suppress warning if /dev/urandom is not readable (bug #997)Bjoern Schiessle2012-06-141-1/+1
| * fix another ui bug of calendarGeorg Ehrke2012-06-131-4/+6
| * another ui fixGeorg Ehrke2012-06-131-9/+4
| * fix a ui bug for calendar sharingGeorg Ehrke2012-06-131-1/+1
| * show username of the body who shares in the summaryGeorg Ehrke2012-06-132-7/+9
| * Whitespace fixBart Visscher2012-06-131-1/+1
| * CSSMin: Remove debug codeBart Visscher2012-06-131-1/+0
| * Files Texteditor: Use our own "Droid Sans Mono" font-face and fontsBart Visscher2012-06-139-2/+698
| * Calendar: Clicking #datecontrol_date gives datepicker to jump to dateBart Visscher2012-06-131-1/+17
| * Calendar: Make button of #datecontrol_dateBart Visscher2012-06-132-2/+2
| * 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 incorrect creation of filesystem for user@group in data folder during sharesMichael Gapczynski2012-06-121-4/+4