summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7804 from jbtbnl/masterMorris Jobke2014-03-191-1/+1
|\ | | | | Remove cursor:pointer CSS from li element
| * Fix #7758jbtbnl2014-03-191-1/+1
| |
* | Merge pull request #7806 from owncloud/add-matroska-videoLukas Reschke2014-03-191-0/+1
|\ \ | |/ |/| Add mimetype for MKV videos
| * Add mimetype for MKV videosLukas Reschke2014-03-191-0/+1
|/ | | | | | | This will make oC create previews for MKVs. Test file: http://www.auby.no/files/video_tests/h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv To test this just apply this change and upload the test file, if an preview is generated this change is most likely working as expecting.
* Merge pull request #7557 from owncloud/issue/7297Vincent Petry2014-03-192-1/+21
|\ | | | | Do not allow setting an expiration date in the past
| * 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
| | | | | | | | Fix #7297
* | Merge pull request #7800 from owncloud/filesort-performanceicewind19912014-03-193-11/+17
|\ \ | | | | | | Improve sorting performance of large lists of files
| * | 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 submodule
| * | 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 -> OC6
| * | | 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
|\ \ \ \ | | | | | | | | | | Fix validation of allowed personal backend
| * | | | Added unit tests for when adding ext storage mount pointsVincent Petry2014-03-182-16/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - test config was written correctly (global and local) - test that personal mount points can be added for allowed backends - test that personal mount points cannot be added for disallowed backends - added $skipTest flag to make it possible add mount points without doing an actual check/connection (note: this is necessary because the static class OC_Mount_Config cannot be mocked)
| * | | | 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 auto
| * | | | | 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 shares
| * | | | Fix smb4php to work with home sharesRobin McCorkell2014-03-171-11/+5
| | | | | | | | | | | | | | | Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
* | | | | Merge pull request #7784 from owncloud/enc-adminpageallowuploadMorris Jobke2014-03-181-2/+0
|\ \ \ \ \ | |_|/ / / |/| | | | Display admin option for public upload with encryption enabled
| * | | | Display admin option for public upload with encryption enabledVincent Petry2014-03-181-2/+0
|/ / / / | | | | | | | | | | | | | | | | Now that public upload works with encryption, the admin option to toggle it must be made visible.
* | / / [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
|\ \ \ | |/ / |/| | 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-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 datadir
| * | | 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 format
| * | | | Correctly round bytes when converted from human readable formatVincent Petry2014-03-172-3/+5
| |/ / / | | | | | | | | | | | | | | | | Instead of leave two decimal places which is confusing, round the byte values correctly to the closest byte.
* | | | Merge pull request #7761 from owncloud/improve_documentationVincent Petry2014-03-171-1/+1
|\ \ \ \ | | | | | | | | | | clarify the use-case of the encryption app.
| * | | | 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 upgrade
| * | | | Added warning for trusted_domains after CLI upgradeVincent Petry2014-03-142-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | 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-173-56/+122
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | make it possible to influence output type of \OC_Image
| * | | | | 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 class
| * | | | | | remove unneeded icon classJan-Christoph Borchardt2014-03-143-6/+6
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 14:58:49 +0000