summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | close the session on all file operationsThomas Müller2014-03-1014-10/+16
| * | | | | | | | | | adding an explicit close method to class session - write operations (set and ...Thomas Müller2014-03-104-1/+20
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-20309-3359/+1973
* | | | | | | | | | | Merge pull request #7804 from jbtbnl/masterMorris Jobke2014-03-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix #7758jbtbnl2014-03-191-1/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7806 from owncloud/add-matroska-videoLukas Reschke2014-03-191-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add mimetype for MKV videosLukas Reschke2014-03-191-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #7557 from owncloud/issue/7297Vincent Petry2014-03-192-1/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use tipsy to display error when selecting a date in the pastJoas Schilling2014-03-191-2/+10
| * | | | | | | | | Do not allow setting an expiration date in the pastJoas Schilling2014-03-052-1/+13
* | | | | | | | | | Merge pull request #7800 from owncloud/filesort-performanceicewind19912014-03-193-11/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Improve sorting performance of large lists of filesRobin Appelman2014-03-193-11/+17
|/ / / / / / / / /
* | | | | | | | | Merge pull request #7777 from owncloud/fix/7776Thomas Müller2014-03-191-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | updating 3rdparty submoduleThomas Müller2014-03-171-0/+0
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7790 from owncloud/fix/7788Thomas Müller2014-03-199-584/+62
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | drop file cache migration OC5 -> OC6Thomas Müller2014-03-189-584/+62
* | | | | | | | | 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