summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed ext storage unit test for groupsVincent Petry2014-03-191-30/+46
* Added tests to check mount point list for a target userVincent Petry2014-03-192-7/+132
* Moved external storage mounting code to files_external appVincent Petry2014-03-193-74/+86
* Added IV for ext storage password encryptionVincent Petry2014-03-192-10/+42
* Added password obfuscation for external storage configVincent Petry2014-03-193-3/+148
* Added ext storage unit tests for writing then reload the mount configVincent Petry2014-03-191-1/+73
* Merge pull request #7792 from owncloud/extstorage-fixpersonalstorageVincent Petry2014-03-192-17/+136
|\
| * Added unit tests for when adding ext storage mount pointsVincent Petry2014-03-182-16/+135
| * Fix validation of allowed personal backendVincent Petry2014-03-181-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1945-374/+470
* | Merge pull request #7791 from owncloud/app-setting-auto-scrollMorris Jobke2014-03-191-1/+1
|\ \
| * | Set overflow-y to autoThomas Tanghus2014-03-181-1/+1
* | | Merge pull request #7766 from Xenopathic/masterRobin McCorkell2014-03-181-11/+5
|\ \ \ | |/ / |/| |
| * | Fix smb4php to work with home sharesRobin McCorkell2014-03-171-11/+5
* | | Merge pull request #7784 from owncloud/enc-adminpageallowuploadMorris Jobke2014-03-181-2/+0
|\ \ \ | |_|/ |/| |
| * | Display admin option for public upload with encryption enabledVincent Petry2014-03-181-2/+0
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1817-39/+39
* | Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-1714-66/+269
|\ \ | |/ |/|
| * update copyright headerRobin Appelman2014-03-101-1/+1
| * switch OC::getRouter usages to OC::$server->getRouterRobin Appelman2014-03-104-13/+5
| * Move the router classes to a namespace and expose it with a public interfaceRobin Appelman2014-03-1011-55/+266
* | 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-172-3/+5
|\ \ \
| * | | Correctly round bytes when converted from human readable formatVincent Petry2014-03-172-3/+5
| |/ /
* | | Merge pull request #7761 from owncloud/improve_documentationVincent Petry2014-03-171-1/+1
|\ \ \
| * | | clearify the use-case of this appFrank Karlitschek2014-03-171-1/+1
| |/ /
* | | Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarningicewind19912014-03-172-1/+27
|\ \ \
| * | | Added warning for trusted_domains after CLI upgradeVincent Petry2014-03-142-1/+27
* | | | Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete...Vincent Petry2014-03-172-12/+58
|\ \ \ \
| * | | | 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-173-56/+122
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | unit tests for specific image type output addedThomas Müller2014-03-172-3/+28
| * | | | 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-1716-107/+132
* | | | | Merge pull request #7734 from owncloud/icon-class-removeMorris Jobke2014-03-163-6/+6
|\ \ \ \ \
| * | | | | remove unneeded icon classJan-Christoph Borchardt2014-03-143-6/+6
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1631-195/+263
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1599-558/+683
|/ / / / /
* | | | | Merge pull request #7725 from owncloud/body-publicRaghu Nayyar2014-03-141-1/+1
|\ \ \ \ \
| * | | | | add 'body-public' ID to body in base layout so it can be identified via CSSJan-Christoph Borchardt2014-03-141-1/+1
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1412-12/+12
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1323-3470/+12
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1372-408/+4760
|/ / / /