summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5850 from owncloud/oc_api_testsThomas Müller2013-11-141-17/+46
|\
| * Merge multiple failed third party responses when returning the resulttomneedham2013-11-141-3/+10
| * Merge multiple shipped failures before responding.tomneedham2013-11-141-2/+10
| * Return failed shipped responses over succedded shipped responsestomneedham2013-11-141-3/+3
| * 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-145-12/+101
| |\ \
| * | | Remove OC_App dependancy from OC_API::mergeResponses()tomneedham2013-11-131-9/+12
| | |/ | |/|
* | | Merge pull request #5827 from owncloud/avoid_preview_errorsThomas Müller2013-11-145-7/+12
|\ \ \ | |_|/ |/| |
| * | Use dedicated OC_Image loader methodsThomas Tanghus2013-11-135-7/+12
| |/
* | Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-ho...Morris Jobke2013-11-134-9/+76
|\ \
| * | Now using HomeStorage for legacy home storage idsVincent Petry2013-11-122-4/+24
| * | 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-123-5/+60
* | | Merge pull request #5447 from owncloud/fixing-5117-masterVincent Petry2013-11-131-3/+25
|\ \ \ | |_|/ |/| |
| * | 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 trash bin and file versions delete hooks in OC::registerPreviewHooksGeorg Ehrke2013-11-121-0/+2
| |/ |/|
* | Merge pull request #5701 from owncloud/sharing-updateownerfoldersizesMorris Jobke2013-11-111-3/+6
|\ \
| * | Fixed watcher to also update the owner's folder sizesVincent Petry2013-11-051-3/+6
* | | Merge pull request #5687 from owncloud/fixing-5659-masterThomas Müller2013-11-091-8/+3
|\ \ \
| * | | display the exception instead of meaningless messageThomas Müller2013-11-041-8/+3
* | | | Merge pull request #5759 from owncloud/fixing-5757-masterThomas Müller2013-11-091-2/+13
|\ \ \ \
| * | | | implementing solution using <ifModule mod_authz_core>Thomas Müller2013-11-081-4/+8
| * | | | adding proper htaccess commands for Apache 2.4Thomas Müller2013-11-081-2/+9
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-091-0/+8
* | | | | the filesystem has to be initialized once we know the userThomas Müller2013-11-081-0/+8
|/ / / /
* | | | Merge pull request #5747 from owncloud/scanner-post-hooksMorris Jobke2013-11-071-0/+5
|\ \ \ \
| * | | | Add post hooks for filesystem scannerRobin Appelman2013-11-071-0/+5
* | | | | Now removing stray old cookies from 5.0.12Vincent Petry2013-11-071-0/+5
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-061-1/+1
* | | | Merge pull request #5691 from owncloud/switch-to-oc6-documentationblizzz2013-11-051-1/+1
|\ \ \ \
| * | | | move to oc6 documentationThomas Müller2013-11-041-1/+1
| |/ / /
* | | | decode arguments as arrayThomas Müller2013-11-051-1/+1
* | | | Merge pull request #5582 from owncloud/files-previewcachingThomas Müller2013-11-051-2/+2
|\ \ \ \
| * | | | Append file etag to preview URLsVincent Petry2013-10-281-2/+2
* | | | | Merge pull request #5673 from owncloud/oc6-windows-server-mssql-masterThomas Müller2013-11-052-11/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Inherit lastInsertId() from Adapter.Andreas Fischer2013-11-041-5/+0
| * | | | WIN: fixing Fatal error: Call to a member function logicToPhysical() on a non...Thomas Mueller2013-11-021-4/+3
| * | | | mssql: fixing lastInsertId() implementationThomas Mueller2013-11-021-4/+2
* | | | | Merge pull request #5540 from owncloud/scanner-enhancments-masterThomas Müller2013-11-042-3/+17
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | set log level to DEBUGThomas Müller2013-11-041-2/+4
| * | | | using array_diff_assoc to detect diffs in values as wellThomas Müller2013-10-251-1/+1
| * | | | cast storage_mtime to intThomas Müller2013-10-251-0/+1
| * | | | log the data arraysThomas Müller2013-10-241-1/+3
| * | | | some logging added ....Thomas Müller2013-10-241-2/+11
* | | | | Merge pull request #5544 from owncloud/fixing-3593-2-masterThomas Müller2013-11-042-1/+17
|\ \ \ \ \