Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added ext storage unit tests for writing then reload the mount config | Vincent Petry | 2014-03-19 | 1 | -1/+73 |
| | |||||
* | Merge pull request #7792 from owncloud/extstorage-fixpersonalstorage | Vincent Petry | 2014-03-19 | 2 | -17/+136 |
|\ | | | | | Fix validation of allowed personal backend | ||||
| * | Added unit tests for when adding ext storage mount points | Vincent Petry | 2014-03-18 | 2 | -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 backend | Vincent Petry | 2014-03-18 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-19 | 45 | -374/+470 |
| | | |||||
* | | Merge pull request #7791 from owncloud/app-setting-auto-scroll | Morris Jobke | 2014-03-19 | 1 | -1/+1 |
|\ \ | | | | | | | Set overflow-y to auto | ||||
| * | | Set overflow-y to auto | Thomas Tanghus | 2014-03-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #7766 from Xenopathic/master | Robin McCorkell | 2014-03-18 | 1 | -11/+5 |
|\ \ \ | |/ / |/| | | Fix smb4php to work with home shares | ||||
| * | | Fix smb4php to work with home shares | Robin McCorkell | 2014-03-17 | 1 | -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-adminpageallowupload | Morris Jobke | 2014-03-18 | 1 | -2/+0 |
|\ \ \ | |_|/ |/| | | Display admin option for public upload with encryption enabled | ||||
| * | | Display admin option for public upload with encryption enabled | Vincent Petry | 2014-03-18 | 1 | -2/+0 |
|/ / | | | | | | | | | Now that public upload works with encryption, the admin option to toggle it must be made visible. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-18 | 17 | -39/+39 |
| | | |||||
* | | Merge pull request #7649 from owncloud/routing-public | Thomas Müller | 2014-03-17 | 14 | -66/+269 |
|\ \ | |/ |/| | Move routing classes to an interface and expose it in the public api | ||||
| * | update copyright header | Robin Appelman | 2014-03-10 | 1 | -1/+1 |
| | | |||||
| * | switch OC::getRouter usages to OC::$server->getRouter | Robin Appelman | 2014-03-10 | 4 | -13/+5 |
| | | |||||
| * | Move the router classes to a namespace and expose it with a public interface | Robin Appelman | 2014-03-10 | 11 | -55/+266 |
| | | |||||
* | | Merge pull request #7764 from owncloud/datadir-chmod | icewind1991 | 2014-03-17 | 2 | -30/+1 |
|\ \ | | | | | | | use a non-recursive chmod on the datadir | ||||
| * | | use a non-recursive chmod on the datadir | Robin Appelman | 2014-03-17 | 2 | -30/+1 |
| | | | |||||
* | | | Merge pull request #7760 from owncloud/core-roundbytes | icewind1991 | 2014-03-17 | 2 | -3/+5 |
|\ \ \ | | | | | | | | | Correctly round bytes when converted from human readable format | ||||
| * | | | Correctly round bytes when converted from human readable format | Vincent Petry | 2014-03-17 | 2 | -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_documentation | Vincent Petry | 2014-03-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | clarify the use-case of the encryption app. | ||||
| * | | | clearify the use-case of this app | Frank Karlitschek | 2014-03-17 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning | icewind1991 | 2014-03-17 | 2 | -1/+27 |
|\ \ \ | | | | | | | | | Added warning for trusted_domains after CLI upgrade | ||||
| * | | | Added warning for trusted_domains after CLI upgrade | Vincent Petry | 2014-03-14 | 2 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | If trusted_domains is not set after a CLI upgrade, show a warning in the output. | ||||
* | | | | Merge pull request #7704 from ↵ | Vincent Petry | 2014-03-17 | 2 | -12/+58 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/preview_use_pre_instead_of_post_delete_hook_2 use preDelete instead of postDelete hook | ||||
| * | | | | improve validation of getFileInfo in \OC\Preview | Georg Ehrke | 2014-03-13 | 1 | -8/+20 |
| | | | | | |||||
| * | | | | use preDelete instead of postDelete hook | Georg Ehrke | 2014-03-13 | 2 | -4/+38 |
| | | | | | |||||
* | | | | | Merge pull request #7728 from owncloud/oc_image_show_save_custom_mime | Vincent Petry | 2014-03-17 | 3 | -56/+122 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | make it possible to influence output type of \OC_Image | ||||
| * | | | | unit tests for specific image type output added | Thomas Müller | 2014-03-17 | 2 | -3/+28 |
| | | | | | |||||
| * | | | | fixing PHPDoc | Thomas Müller | 2014-03-17 | 1 | -49/+58 |
| | | | | | |||||
| * | | | | OC_Image::_output() - throw exception instead of falling back to png | Georg Ehrke | 2014-03-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | remove image/pjpeg from OC_Image::_output | Georg Ehrke | 2014-03-14 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | don't change mimetype of whole image object | Georg Ehrke | 2014-03-14 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | always output a png | Georg Ehrke | 2014-03-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | make it possible to influence output type of \OC_Image | Georg Ehrke | 2014-03-14 | 1 | -7/+40 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-17 | 16 | -107/+132 |
| | | | | | |||||
* | | | | | Merge pull request #7734 from owncloud/icon-class-remove | Morris Jobke | 2014-03-16 | 3 | -6/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | remove unneeded icon class | ||||
| * | | | | | remove unneeded icon class | Jan-Christoph Borchardt | 2014-03-14 | 3 | -6/+6 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-16 | 31 | -195/+263 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-15 | 99 | -558/+683 |
|/ / / / / | |||||
* | | | | | Merge pull request #7725 from owncloud/body-public | Raghu Nayyar | 2014-03-14 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | add 'body-public' ID to body in base layout so it can be identified via CSS | ||||
| * | | | | | add 'body-public' ID to body in base layout so it can be identified via CSS | Jan-Christoph Borchardt | 2014-03-14 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-14 | 12 | -12/+12 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 23 | -3470/+12 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 72 | -408/+4760 |
|/ / / / | |||||
* | | | | Merge pull request #7686 from owncloud/ocs_fix_paths | Björn Schießle | 2014-03-13 | 3 | -7/+132 |
|\ \ \ \ | | | | | | | | | | | finally fix the paths for the OCS Share API | ||||
| * | | | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-13 | 3 | -7/+132 |
| | | | | | |||||
* | | | | | Merge pull request #7718 from owncloud/fixing-7345-master | Thomas Müller | 2014-03-13 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | map transifex language ja_JP to ja | ||||
| * | | | | | map transifex language ja_JP to ja | Thomas Müller | 2014-03-13 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #7340 from owncloud/hide_remove_image_avatar | Morris Jobke | 2014-03-13 | 1 | -0/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | Hide remove image, if there's no custom avatar |