aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Fixed getLocalFile() condition for x-send-fileVincent Petry2013-11-201-3/+5
* Merge pull request #5927 from owncloud/quota-excludeextstorageMorris Jobke2013-11-184-7/+12
|\
| * External storage space is now not counted in total spaceVincent Petry2013-11-184-7/+12
* | Root size for home storage is now size of "files" subdirVincent Petry2013-11-181-0/+13
|/
* one tab lessFrank Karlitschek2013-11-181-1/+1
* fix the version check for downloaded apps. Fixes https://github.com/owncloud/...Frank Karlitschek2013-11-181-2/+9
* Merge pull request #5789 from ogasser/db_fix_default_for_numericBart Visscher2013-11-151-1/+4
|\
| * treat numeric as an alias for decimalOliver Gasser2013-11-121-0/+3
| * changed type to decimalOliver Gasser2013-11-121-1/+1
| * DB: Set correct default value for numeric typesOliver Gasser2013-11-101-1/+1
* | Merge pull request #5813 from owncloud/fix-4736-masterThomas Müller2013-11-151-1/+1
|\ \
| * | Don't set a default value when there isn't a default specifiedBart Visscher2013-11-111-1/+1
| |/
* | Merge branch 'master' into moviepreviewfallbackThomas Müller2013-11-1414-44/+208
|\ \
| * \ Merge pull request #5862 from owncloud/files-singledotdirsThomas Müller2013-11-141-3/+17
| |\ \
| | * | Fixed normalizePath() to strip out single dot dirsVincent Petry2013-11-141-3/+17
| * | | 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
| * | | 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 #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
| * | | | 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
* | | | | Added missing escapingVincent Petry2013-11-111-1/+1
* | | | | Fixed undefined variable error when using avconvVincent Petry2013-11-101-0/+2
* | | | | Fixed the rebellous space, replaced with a tabVincent Petry2013-11-081-1/+1
* | | | | Added ffmpeg fallback when avconv is not availableVincent Petry2013-11-081-11/+45
|/ / / /
* / / / Now removing stray old cookies from 5.0.12Vincent Petry2013-11-071-0/+5
|/ / /
* | | Merge pull request #5691 from owncloud/switch-to-oc6-documentationblizzz2013-11-051-1/+1
|\ \ \
| * | | move to oc6 documentationThomas Müller2013-11-041-1/+1