summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge multiple shipped failures before responding.tomneedham2013-11-141-2/+10
* Return failed shipped responses over succedded shipped responsestomneedham2013-11-141-3/+3
* Fix type in unit testtomneedham2013-11-141-1/+1
* Return result object when only one successful response is returnedtomneedham2013-11-141-2/+2
* Update lib/private/api.php after merge conflicttomneedham2013-11-141-1/+1
* Merge branch 'ocs_api_fix_success_code' into oc_api_teststomneedham2013-11-141-2/+13
|\
| * Pick any none 100 status code before defaulting to 100Tom Needham2013-11-131-2/+13
* | Merge branch 'master' into oc_api_teststomneedham2013-11-1425-217/+531
|\ \
| * \ Merge branch 'master' of https://github.com/owncloud/corev6.0.0beta4Frank Karlitschek2013-11-1317-140/+397
| |\ \
| | * \ Merge pull request #5805 from owncloud/shared-storage-copy-folderlistFrank Karlitschek2013-11-131-59/+47
| | |\ \
| | | * | Use View::copy and View::rename when copying or renaming files in the shared ...Robin Appelman2013-11-111-59/+47
| | * | | Merge pull request #5806 from owncloud/styles-fix-external_storageFrank Karlitschek2013-11-132-0/+9
| | |\ \ \
| | | * | | Fix spacing issue for checkboxes, vertically center checkboxes on personal pageMorris Jobke2013-11-112-0/+9
| | | |/ /
| | * | | Merge pull request #5809 from owncloud/fix5753Morris Jobke2013-11-135-53/+35
| | |\ \ \
| | | * | | LDAP Wizard: make UI behaviour more consistent and more pleasant when determi...Arthur Schiwon2013-11-112-7/+6
| | | * | | LDAP Wizard: remove ugly whitespace where it should not beArthur Schiwon2013-11-111-2/+1
| | | * | | LDAP Wizard: determine port without credentials. don't hide the port input fieldArthur Schiwon2013-11-113-13/+12
| | | * | | LDAP Wizard: improve check for Agent DN and CredentialsArthur Schiwon2013-11-111-26/+16
| | | * | | LDAP Wizard: keep Base DN always visibleArthur Schiwon2013-11-082-6/+1
| | * | | | Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-ho...Morris Jobke2013-11-138-25/+303
| | |\ \ \ \
| | | * | | | Now using HomeStorage for legacy home storage idsVincent Petry2013-11-124-6/+115
| | | * | | | Now calling parent method when path is not rootVincent Petry2013-11-121-16/+8
| | | * | | | Do not use -1 as the size for the root folder of the home storageRobin Appelman2013-11-125-19/+196
| | * | | | | Merge pull request #5831 from owncloud/files-charatissueMorris Jobke2013-11-131-3/+3
| | |\ \ \ \ \
| | | * | | | | Fixed total dirs/files message hiding conditionVincent Petry2013-11-131-3/+3
| | | | |_|_|/ | | | |/| | |
| * | / | | | beta 4Frank Karlitschek2013-11-131-2/+2
| |/ / / / /
| * | | | | Merge pull request #5447 from owncloud/fixing-5117-masterVincent Petry2013-11-137-75/+132
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | rename fixPartialFilePath() to stripPartialFileExtension(), this name describ...Bjoern Schiessle2013-11-124-12/+12
| | * | | | missed some replacements... now tests should workBjoern Schiessle2013-11-121-13/+6
| | * | | | fixing tests for the new part file handlingBjoern Schiessle2013-11-125-42/+86
| | * | | | let encryption app detect transfer id in path and handle it correctlyBjoern Schiessle2013-11-113-36/+34
| | * | | | make it possible to detect transferID partBjoern Schiessle2013-11-111-1/+1
| | * | | | adding oc-mtime handling to chunked uploadThomas Müller2013-10-211-0/+9
| | * | | | chunked files are assembled into a part file on the target storage followed b...Thomas Müller2013-10-211-3/+16
* | | | | | Add tests for OC_API::mergeResponses()tomneedham2013-11-141-0/+159
* | | | | | Remove OC_App dependancy from OC_API::mergeResponses()tomneedham2013-11-131-9/+12
|/ / / / /
* | | | | Merge pull request #5822 from owncloud/delete_hooks_trash_and_versionsMorris Jobke2013-11-123-0/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | add trash bin and file versions delete hooks in OC::registerPreviewHooksGeorg Ehrke2013-11-121-0/+2
| * | | | implement delete hooks in file versions libGeorg Ehrke2013-11-121-0/+3
| * | | | replace $path with '/files_trashbin/files/' . $fileGeorg Ehrke2013-11-121-1/+1
| * | | | add delete hook for trash bin appGeorg Ehrke2013-11-121-0/+1
|/ / / /
* | | | Merge pull request #5810 from owncloud/disbaledtextareasMorris Jobke2013-11-121-1/+2
|\ \ \ \
| * | | | new line for css ruleMorris Jobke2013-11-121-1/+2
| * | | | Disabled textareas should look like they are disabledArthur Schiwon2013-11-111-1/+1
* | | | | Merge pull request #5816 from Wikinaut/patch-1Thomas Müller2013-11-121-1/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update config.sample.phpWikinaut2013-11-121-1/+5
|/ / / /
* | | | Merge pull request #5804 from owncloud/files-selectionsummaryMorris Jobke2013-11-111-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Selection summary is now displayed properlyVincent Petry2013-11-111-1/+1
* | | | Merge pull request #5707 from owncloud/fixwrongfilesizeintestsMorris Jobke2013-11-111-0/+3
|\ \ \ \
| * | | | Fixed filesize issue in watchr testVincent Petry2013-11-051-0/+3
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 10:24:11 +0000