Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix-setupfs-only-for-existing-users-master | Thomas Müller | 2014-01-21 | 1 | -1/+1 |
|\ | |||||
| * | use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -1/+1 |
| | | |||||
* | | OC_Util::setupFS($user) will create a data dir for the given string - no ↵ | Thomas Müller | 2014-01-21 | 3 | -1/+27 |
|/ | | | | matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error | ||||
* | Merge pull request #6820 from owncloud/phpunit-test-config | Thomas Müller | 2014-01-20 | 4 | -5/+14 |
|\ | | | | | Load a separate config (if present) when running unit tests | ||||
| * | Move test config folder to tests/config | Robin Appelman | 2014-01-20 | 1 | -2/+2 |
| | | |||||
| * | Load a separate config (if present) when running unit tests | Robin Appelman | 2014-01-17 | 4 | -5/+14 |
| | | |||||
* | | Reuse the data retrieved from the cache in checkUpdate | Robin Appelman | 2014-01-20 | 2 | -4/+7 |
| | | |||||
* | | Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix | Vincent Petry | 2014-01-20 | 1 | -1/+1 |
|\ \ | | | | | | | Fixed quota wrapper to not wrap failed fopen streams | ||||
| * | | Fixed quota wrapper to not wrap failed fopen streams | Vincent Petry | 2014-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling fopen() on some storage types, these return false instead of throwing an exception. This fix makes sure that in case the stream wasn't opened (for example when a file doesn't exist any more) the stream isn't wrapped. Also added 'rb' as another case that doesn't need to be wrapped. Fixes #6832 | ||||
* | | | Merge pull request #6676 from aseques/check_internet_proxy | Thomas Müller | 2014-01-19 | 1 | -0/+5 |
|\ \ \ | |/ / |/| | | Fix internet detection to use OC_Util::getUrlContent | ||||
| * | | Disabled internet checking as mentioned when in proxy mode | Joan | 2014-01-10 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps | Morris Jobke | 2014-01-18 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Fix activation of unknown apps | ||||
| * | | | error handling in case a requested app doesn't exists | Thomas Müller | 2014-01-15 | 1 | -0/+3 |
| | | | | |||||
* | | | | show link to app documentation | Bjoern Schiessle | 2014-01-17 | 1 | -0/+4 |
| |_|/ |/| | | |||||
* | | | Merge pull request #6644 from ben-denham/unshare-all-fix | Björn Schießle | 2014-01-16 | 1 | -1/+9 |
|\ \ \ | |/ / |/| | | \OCP\Share::unshareAll() fix | ||||
| * | | Unshare all will now delete all shares for the item, instead of only for a ↵ | ben-denham | 2014-01-06 | 1 | -1/+9 |
| | | | | | | | | | | | | single owner. | ||||
* | | | Merge pull request #6744 from owncloud/fix_ocs_response_messages | Thomas Müller | 2014-01-15 | 1 | -20/+22 |
|\ \ \ | | | | | | | | | keep response message | ||||
| * | | | keep response message | Bjoern Schiessle | 2014-01-13 | 1 | -20/+22 |
| | | | | |||||
* | | | | Merge pull request #6768 from owncloud/scanner-use-storage-mtime | Vincent Petry | 2014-01-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use storage_mtime when determining if we can reuse cached data while scanning | ||||
| * | | | | Use storage_mtime when determining if we can reuse cached data while scanning | Robin Appelman | 2014-01-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6704 from owncloud/encryptedfoldersizecalc | Vincent Petry | 2014-01-14 | 1 | -5/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix calculated folder size to use unencrypted size | ||||
| * | | | | Fix calculated folder size to use unencrypted size | Vincent Petry | 2014-01-09 | 1 | -5/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The encrypted size was used when calculating folder sizes. This fix now also sums up the unencrypted size and shows that one when available. | ||||
* | | | | | remove ru_RU - it has bee removed from transifex | Thomas Müller | 2014-01-13 | 1 | -12/+0 |
| | | | | | |||||
* | | | | | fixing typo in redirection query string | st3so | 2014-01-12 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #6687 from owncloud/sharing-fixpartfilehandling | Vincent Petry | 2014-01-09 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Removed special handling of part files in shared storage rename | ||||
| * | | | | Removed special handling of part files in shared storage rename | Vincent Petry | 2014-01-08 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the issue introduced by the transfer id which itself wasn't taken into account by the shortcut code for part file in the shared storage class. | ||||
* | | | | | rename user-id to loginname to stay consistent | Thomas Müller | 2014-01-09 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | set login name within apache auth backend | Thomas Müller | 2014-01-09 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | fixing PHPDoc and use cameCase names | Thomas Müller | 2014-01-09 | 1 | -7/+7 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #6681 from owncloud/userreport | blizzz | 2014-01-08 | 4 | -7/+56 |
|\ \ \ \ | | | | | | | | | | | add command line option to get user number statistics | ||||
| * | | | | Infowarning about 32bit | Arthur Schiwon | 2014-01-08 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | add tests for user counting | Arthur Schiwon | 2014-01-08 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | if backends have the same class name, sum their users up instead of overwriting | Arthur Schiwon | 2014-01-08 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Introduce user count action to user management | Arthur Schiwon | 2014-01-07 | 3 | -7/+42 |
| | | | | | |||||
* | | | | | Fix ownCloud for php5.3.x | Thomas Müller | 2014-01-08 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Prevent deleting storage root | Vincent Petry | 2014-01-08 | 1 | -0/+13 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Storage mount points are not deletable, so make sure that the unlink operation and its hooks aren't run in such cases. Note that some storages might recursively delete their contents when calling unlink on their root. This fix prevents that as well. | ||||
* | | | | Merge branch 'master' into disable-mod_pagespeed | Thomas Müller | 2014-01-08 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #6673 from ↵ | Vincent Petry | 2014-01-08 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes #6526 | ||||
* | | | | | turn off mod_pagespeed | Thomas Müller | 2014-01-08 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | Merge pull request #6594 from owncloud/kill-index.php-from-url | Jörn Friedrich Dreyer | 2014-01-07 | 3 | -4/+28 |
|\ \ \ \ | |/ / / |/| | | | 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 | ||||
* | | | | 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 | 4 | -6/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | Files androidcontentdisposition | ||||
| * | | | | | Added isUserAgent() method to request | Vincent Petry | 2013-12-19 | 2 | -2/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 |