Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7649 from owncloud/routing-public | Thomas Müller | 2014-03-17 | 11 | -60/+263 |
|\ | | | | | 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 | 3 | -12/+4 |
| | | |||||
| * | Move the router classes to a namespace and expose it with a public interface | Robin Appelman | 2014-03-10 | 9 | -50/+261 |
| | | |||||
* | | 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 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Correctly round bytes when converted from human readable format | ||||
| * | | | Correctly round bytes when converted from human readable format | Vincent Petry | 2014-03-17 | 1 | -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-trusteddomainupgradewarning | icewind1991 | 2014-03-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Added warning for trusted_domains after CLI upgrade | ||||
| * | | | Added warning for trusted_domains after CLI upgrade | Vincent Petry | 2014-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | 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 | 2 | -54/+100 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | make it possible to influence output type of \OC_Image | ||||
| * | | | | unit tests for specific image type output added | Thomas Müller | 2014-03-17 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | 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-16 | 3 | -0/+11 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-15 | 2 | -0/+12 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 2 | -0/+77 |
|/ / / / | |||||
* | | | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-13 | 1 | -2/+4 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 1 | -0/+6 |
|/ / / | |||||
* | | | Merge pull request #6632 from eduardosan/master | Vincent Petry | 2014-03-12 | 1 | -3/+17 |
|\ \ \ | |/ / |/| | | Fix PostgreSQL port configuration on install | ||||
| * | | Remove unused spaces | eduardo | 2014-01-08 | 1 | -2/+2 |
| | | | |||||
| * | | Remove name from code | eduardo | 2014-01-08 | 1 | -2/+0 |
| | | | |||||
| * | | Add tabs to conformance with owncloud code standards | eduardo | 2014-01-05 | 1 | -4/+4 |
| | | | |||||
| * | | Fix PostgreSQL port configuration on install | eduardo | 2014-01-04 | 1 | -3/+19 |
| | | | |||||
* | | | Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions | Vincent Petry | 2014-03-12 | 1 | -3/+30 |
|\ \ \ | | | | | | | | | set content-type on ocs exceptions | ||||
| * | | | fixing method names | Thomas Müller | 2014-03-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | set content-type on ocs exceptions | Thomas Müller | 2014-03-12 | 1 | -3/+30 |
| | | | | |||||
* | | | | Merge pull request #7682 from owncloud/sanitize-fallbackid-master | Lukas Reschke | 2014-03-12 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | sanitize fallbackId | ||||
| * | | | | sanitize fallbackId | Thomas Müller | 2014-03-12 | 1 | -1/+2 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-12 | 45 | -1/+99 |
|/ / / | |||||
* | | | Merge pull request #7665 from owncloud/fix_ocs_share_api_paths | Björn Schießle | 2014-03-11 | 1 | -2/+7 |
|\ \ \ | | | | | | | | | Fix ocs share api paths | ||||
| * | | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-11 | 1 | -2/+7 |
| | | | | |||||
* | | | | Merge pull request #7650 from owncloud/quota-totalspace | Vincent Petry | 2014-03-11 | 2 | -1/+17 |
|\ \ \ \ | | | | | | | | | | | Fixed total space display when data size exceeds quota | ||||
| * | | | | Fixed total space display when data size exceeds quota | Vincent Petry | 2014-03-10 | 2 | -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-7596 | Vincent Petry | 2014-03-11 | 2 | -14/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix 7596 | ||||
| * | | | | | remove magic handling of recipient lists by exploding the string - this ↵ | Thomas Müller | 2014-03-10 | 1 | -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 recipient | Thomas Müller | 2014-03-10 | 1 | -10/+13 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 53 | -279/+159 |
|/ / / / / | |||||
* | | | | | Merge pull request #7602 from owncloud/flush-updater-cache | Vincent Petry | 2014-03-10 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Reset time of last update feed polling after successful update | ||||
| * | | | | | Reset time of last update feed polling | Victor Dubiniuk | 2014-03-06 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Disable XML entities when parsing XML | Vincent Petry | 2014-03-10 | 2 | -4/+14 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #7398 from owncloud/trash_dont_rely_on_db | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [trash] fall back if file is not in db | ||||
| * | | | | | get trash size from file cache | Bjoern Schiessle | 2014-03-10 | 1 | -1/+1 |
| | | | | | |