summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-176-40/+105
|\
| * switch OC::getRouter usages to OC::$server->getRouterRobin Appelman2014-03-102-3/+3
| * Move the router classes to a namespace and expose it with a public interfaceRobin Appelman2014-03-104-37/+102
* | Merge pull request #7764 from owncloud/datadir-chmodicewind19912014-03-172-30/+1
|\ \
| * | use a non-recursive chmod on the datadirRobin Appelman2014-03-172-30/+1
* | | Merge pull request #7760 from owncloud/core-roundbytesicewind19912014-03-171-2/+2
|\ \ \
| * | | Correctly round bytes when converted from human readable formatVincent Petry2014-03-171-2/+2
| |/ /
* | | Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarningicewind19912014-03-171-1/+1
|\ \ \
| * | | Added warning for trusted_domains after CLI upgradeVincent Petry2014-03-141-1/+1
* | | | Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete...Vincent Petry2014-03-171-11/+54
|\ \ \ \
| * | | | improve validation of getFileInfo in \OC\PreviewGeorg Ehrke2014-03-131-8/+20
| * | | | use preDelete instead of postDelete hookGeorg Ehrke2014-03-131-3/+34
| | |/ / | |/| |
* | | | unit tests for specific image type output addedThomas Müller2014-03-171-1/+6
* | | | fixing PHPDocThomas Müller2014-03-171-49/+58
* | | | OC_Image::_output() - throw exception instead of falling back to pngGeorg Ehrke2014-03-141-1/+1
* | | | remove image/pjpeg from OC_Image::_outputGeorg Ehrke2014-03-141-1/+0
* | | | don't change mimetype of whole image objectGeorg Ehrke2014-03-141-6/+6
* | | | always output a pngGeorg Ehrke2014-03-141-1/+1
* | | | make it possible to influence output type of \OC_ImageGeorg Ehrke2014-03-141-7/+40
|/ / /
* | | Merge pull request #6632 from eduardosan/masterVincent Petry2014-03-121-3/+17
|\ \ \ | |/ / |/| |
| * | Remove unused spaceseduardo2014-01-081-2/+2
| * | Remove name from codeeduardo2014-01-081-2/+0
| * | Add tabs to conformance with owncloud code standardseduardo2014-01-051-4/+4
| * | Fix PostgreSQL port configuration on installeduardo2014-01-041-3/+19
* | | Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptionsVincent Petry2014-03-121-3/+30
|\ \ \
| * | | fixing method namesThomas Müller2014-03-121-1/+1
| * | | set content-type on ocs exceptionsThomas Müller2014-03-121-3/+30
* | | | sanitize fallbackIdThomas Müller2014-03-121-1/+2
|/ / /
* | | Merge pull request #7650 from owncloud/quota-totalspaceVincent Petry2014-03-112-1/+17
|\ \ \
| * | | Fixed total space display when data size exceeds quotaVincent Petry2014-03-102-1/+17
* | | | remove magic handling of recipient lists by exploding the string - this funct...Thomas Müller2014-03-101-4/+1
* | | | send an individual email to each recipientThomas Müller2014-03-101-10/+13
* | | | Merge pull request #7602 from owncloud/flush-updater-cacheVincent Petry2014-03-101-0/+2
|\ \ \ \
| * | | | Reset time of last update feed pollingVictor Dubiniuk2014-03-061-0/+2
* | | | | Disable XML entities when parsing XMLVincent Petry2014-03-102-4/+14
* | | | | Merge pull request #7398 from owncloud/trash_dont_rely_on_dbVincent Petry2014-03-101-1/+1
|\ \ \ \ \
| * | | | | get trash size from file cacheBjoern Schiessle2014-03-101-1/+1
* | | | | | Merge pull request #7632 from owncloud/fix-7582-masterThomas Müller2014-03-101-11/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | fixing identThomas Müller2014-03-071-9/+9
| * | | | | we first shall check if the current session is valid - otherwise the session-...Thomas Müller2014-03-071-12/+13
| | |_|/ / | |/| | |
* | | | | Merge pull request #7624 from owncloud/enc-encryptedusedspacefixVincent Petry2014-03-102-2/+12
|\ \ \ \ \
| * | | | | Return unencrypted_size of folder when queriedVincent Petry2014-03-071-0/+5
| * | | | | Propagate unencrypted_size up to the file cache rootVincent Petry2014-03-071-2/+7
* | | | | | Merge pull request #7628 from owncloud/fileinfo-typeThomas Tanghus2014-03-091-3/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Check if value exists before returningRobin Appelman2014-03-071-2/+5
| * | | | | Fix FileInfo->getType errorsRobin Appelman2014-03-071-1/+8
* | | | | | Merge pull request #7529 from owncloud/getlocalfile-cacheicewind19912014-03-071-2/+22
|\ \ \ \ \ \
| * | | | | | Add caching for getLocalFile on remote storagesRobin Appelman2014-03-041-2/+22
* | | | | | | Merge pull request #7583 from owncloud/trusteddomainerrorpageVincent Petry2014-03-071-17/+61
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fixed X-Forwarded-Host parsingVincent Petry2014-03-061-1/+2