| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #6515 from owncloud/autotest-enforcephpunitversion | Thomas Müller | 2014-01-08 | 1 | -2/+17 |
| |\ | | | | | Enforce required phpunit version | ||||
| | * | Enforce required phpunit version | Vincent Petry | 2013-12-19 | 1 | -2/+17 |
| | | | | | | | | | | | This will prevent frustration and confusion when unit tests fail because the wrong phpunit version was used | ||||
| * | | Merge pull request #6675 from owncloud/disable-mod_pagespeed | Vincent Petry | 2014-01-08 | 2 | -0/+6 |
| |\ \ | | | | | | | turn off mod_pagespeed | ||||
| | * \ | Merge branch 'master' into disable-mod_pagespeed | Thomas Müller | 2014-01-08 | 26 | -139/+192 |
| | |\ \ | |||||
| | * | | | turn off mod_pagespeed | Thomas Müller | 2014-01-08 | 2 | -0/+6 |
| | | | | | |||||
| * | | | | Merge pull request #5238 from owncloud/externalstorage-owncloudbackend | Thomas Müller | 2014-01-08 | 6 | -9/+109 |
| |\ \ \ \ | |_|/ / |/| | | | Added ownCloud backend for external storage | ||||
| | * | | | Added ownCloud backend for external storage | Vincent Petry | 2013-10-09 | 6 | -9/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it possible to use the short ownCloud URL (without specifying webdav.php or remote.php), a new backend is available for ownCloud. The user must specify the host + context path in the "Url" field (which is mapped to the "host" parameter) and the subdir to mount in the "Root" field. This is to prevent confusion because some users forget to append webdav.php or remote.php to the WebDAV URL. Fixes #4923 | ||||
| * | | | | Merge pull request #6677 from owncloud/fixing-3rdparty-submodule | Thomas Müller | 2014-01-08 | 1 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | Fix submodule 3rdparty - translation sync broke that | ||||
| | * | | | | Fix submodule 3rdparty - translation sync broke that | Thomas Müller | 2014-01-08 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #6673 from ↵ | Vincent Petry | 2014-01-08 | 2 | -7/+13 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | owncloud/master-quota-insufficientstorageforfilesfix Now also preventing to override "files" dir size with -1 | ||||
| | * | | | | Now also preventing to override "files" dir size with -1 | Vincent Petry | 2014-01-07 | 2 | -7/+13 |
| | | | | | | | | | | | | | | | | | | | | | Fixes #6526 | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-08 | 24 | -132/+179 |
| | |_|/ / |/| | | | |||||
| * | | | | Merge pull request #6594 from owncloud/kill-index.php-from-url | Jörn Friedrich Dreyer | 2014-01-07 | 4 | -5/+30 |
| |\ \ \ \ | | | | | | | | | | | Kill index.php from url | ||||
| | * | | | | use getAppWebPath() in here as well | Thomas Müller | 2013-12-31 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | new config parameter 'front_controller_active' which will instruct the url ↵ | Thomas Müller | 2013-12-31 | 2 | -3/+27 |
| | | | | | | | | | | | | | | | | | | | | | generator to generate urls without index.php | ||||
| | * | | | | avoid conflict with physical file config.js | Thomas Müller | 2013-12-31 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #6565 from owncloud/enable-ldap-unit-tests-master-2 | Thomas Müller | 2014-01-07 | 1 | -0/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | enable ldap tests | ||||
| | * | | | | enable ldap tests | Thomas Müller | 2013-12-24 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #6660 from owncloud/fixing-disabled-function-checks | Thomas Müller | 2014-01-07 | 3 | -4/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixing disabled function checks | ||||
| | * | | | | | trimming all array elements | Thomas Müller | 2014-01-07 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | we shall explode on ',' only | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | reuse existing helper function OC_Helper::is_function_enabled | Thomas Müller | 2014-01-07 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #6290 from owncloud/files-androidcontentdisposition | Thomas Müller | 2014-01-07 | 8 | -69/+99 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Files androidcontentdisposition | ||||
| | * | | | | | | Added isUserAgent() method to request | Vincent Petry | 2013-12-19 | 3 | -2/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added isUserAgent() method to OC_Request which makes it possible to test it - OC_Response::setContentDisposition now uses OC_Request::isUserAgent() | ||||
| | * | | | | | | Added workaround for Android content disposition | Vincent Petry | 2013-12-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5807 | ||||
| | * | | | | | | Moved content disposition code+workarounds to OCP\Response | Vincent Petry | 2013-12-10 | 6 | -69/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new OC\Response API called setContentDispositionHeader() that contains the needed workarounds for UTF8 and IE. Refactored download code to use the new API. Removed unused trashbin download file. | ||||
| * | | | | | | | Merge pull request #6642 from owncloud/update-SabreDAV | Thomas Müller | 2014-01-07 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update sabre dav to 1.7.9 | ||||
| | * | | | | | | | Remove @ in order to get proper error handling | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | reference 3rdparty branch with SabreDAV 1.7.9 installed using composer | Thomas Müller | 2014-01-05 | 1 | -0/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | require composer's autoload.php if present | Thomas Müller | 2014-01-05 | 1 | -2/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #6663 from owncloud/fix_empty_mimetypes | Thomas Müller | 2014-01-07 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | remove duplicate exe mimetype, add correct msi mimetype | ||||
| | * | | | | | | | remove duplicate exe mimetype, add correct msi mimetype | Jörn Friedrich Dreyer | 2014-01-07 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #6530 from ↵ | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | owncloud/prevent-corruption-on-parallel-upload-master Adding a random postfix to the part file. | ||||
| | * | | | | | | | in order to work properly with encryption ocTransferId is added to the file ↵ | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path - questionable usage of magic string | ||||
| | * | | | | | | | Adding a random postfix to the part file. | Thomas Müller | 2013-12-20 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-07 | 41 | -82/+3362 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-06 | 32 | -164/+214 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #6031 from s0taka/master | Morris Jobke | 2014-01-05 | 2 | -2/+5 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | No decimal points for Kilobyte and Byte #5371. | ||||
| | * | | | | | | | spaces to tabs | Simon Könnecke | 2013-12-18 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | No decimal points for Kilobyte and Byte #5371. | Simon Könnecke | 2013-11-25 | 2 | -2/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #6580 from monreal/master | Thomas Müller | 2014-01-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Silence output of 'which' command used in smbclient detection | ||||
| | * | | | | | | | | Silence output of 'which' command used in smbclient detection | Michael Monreal | 2013-12-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-05 | 32 | -154/+203 |
| | | | | | | | | | | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-04 | 25 | -46/+51 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #6610 from owncloud/apcu-clear | icewind1991 | 2014-01-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix APCIterator syntax in \OC\Memcache\APCu::clear | ||||
| | * | | | | | | | | | Fix APCIterator syntax in \OC\Memcache\APCU::clear | Robin Appelman | 2014-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see http://www.php.net/manual/en/apciterator.construct.php | ||||
| * | | | | | | | | | | Merge pull request #6605 from owncloud/free_space_disabled | Thomas Müller | 2014-01-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Return SPACE_UNKNOWN if disk_free_space is disabled | ||||
| | * | | | | | | | | | | Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free ↵ | Robin Appelman | 2014-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space on a local storage | ||||
| * | | | | | | | | | | | Merge pull request #6609 from owncloud/avatar-test-user | Thomas Müller | 2014-01-02 | 1 | -5/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | Make OC_Avatar unit tests independent of currently loggedin user | ||||
| | * | | | | | | | | | | Make OC_Avatar unit tests independent of currently loggedin user | Robin Appelman | 2014-01-02 | 1 | -5/+13 |
| |/ / / / / / / / / / | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |