summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-1711-60/+263
|\ | | | | Move routing classes to an interface and expose it in the public api
| * update copyright headerRobin Appelman2014-03-101-1/+1
| |
| * switch OC::getRouter usages to OC::$server->getRouterRobin Appelman2014-03-103-12/+4
| |
| * Move the router classes to a namespace and expose it with a public interfaceRobin Appelman2014-03-109-50/+261
| |
* | Merge pull request #7764 from owncloud/datadir-chmodicewind19912014-03-172-30/+1
|\ \ | | | | | | use a non-recursive chmod on the datadir
| * | 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 format
| * | | Correctly round bytes when converted from human readable formatVincent Petry2014-03-171-2/+2
| |/ / | | | | | | | | | | | | Instead of leave two decimal places which is confusing, round the byte values correctly to the closest byte.
* | | Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarningicewind19912014-03-171-1/+1
|\ \ \ | | | | | | | | Added warning for trusted_domains after CLI upgrade
| * | | Added warning for trusted_domains after CLI upgradeVincent Petry2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | If trusted_domains is not set after a CLI upgrade, show a warning in the output.
* | | | Merge pull request #7704 from ↵Vincent Petry2014-03-172-12/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/preview_use_pre_instead_of_post_delete_hook_2 use preDelete instead of postDelete hook
| * | | | improve validation of getFileInfo in \OC\PreviewGeorg Ehrke2014-03-131-8/+20
| | | | |
| * | | | use preDelete instead of postDelete hookGeorg Ehrke2014-03-132-4/+38
| | | | |
* | | | | Merge pull request #7728 from owncloud/oc_image_show_save_custom_mimeVincent Petry2014-03-172-54/+100
|\ \ \ \ \ | |_|_|/ / |/| | | | make it possible to influence output type of \OC_Image
| * | | | 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
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-163-0/+11
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-152-0/+12
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-132-0/+77
|/ / / /
* | | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-131-2/+4
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-131-0/+6
|/ / /
* | | Merge pull request #6632 from eduardosan/masterVincent Petry2014-03-121-3/+17
|\ \ \ | |/ / |/| | Fix PostgreSQL port configuration on install
| * | 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
|\ \ \ | | | | | | | | set content-type on ocs exceptions
| * | | fixing method namesThomas Müller2014-03-121-1/+1
| | | |
| * | | set content-type on ocs exceptionsThomas Müller2014-03-121-3/+30
| | | |
* | | | Merge pull request #7682 from owncloud/sanitize-fallbackid-masterLukas Reschke2014-03-121-1/+2
|\ \ \ \ | | | | | | | | | | sanitize fallbackId
| * | | | sanitize fallbackIdThomas Müller2014-03-121-1/+2
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2014-03-1245-1/+99
|/ / /
* | | Merge pull request #7665 from owncloud/fix_ocs_share_api_pathsBjörn Schießle2014-03-111-2/+7
|\ \ \ | | | | | | | | Fix ocs share api paths
| * | | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-111-2/+7
| | | |
* | | | Merge pull request #7650 from owncloud/quota-totalspaceVincent Petry2014-03-112-1/+17
|\ \ \ \ | | | | | | | | | | Fixed total space display when data size exceeds quota
| * | | | Fixed total space display when data size exceeds quotaVincent Petry2014-03-102-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | The total space display in the personal page now shows the quota value instead of used space when used space exceeds the quota (soft quota).
* | | | | Merge pull request #7659 from owncloud/fix-7596Vincent Petry2014-03-112-14/+14
|\ \ \ \ \ | | | | | | | | | | | | Fix 7596
| * | | | | remove magic handling of recipient lists by exploding the string - this ↵Thomas Müller2014-03-101-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname
| * | | | | send an individual email to each recipientThomas Müller2014-03-101-10/+13
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1153-279/+159
|/ / / / /
* | | | | Merge pull request #7602 from owncloud/flush-updater-cacheVincent Petry2014-03-101-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Reset time of last update feed polling after successful update
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | [trash] fall back if file is not in db
| * | | | | get trash size from file cacheBjoern Schiessle2014-03-101-1/+1
| | | | | |