summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix-setupfs-only-for-existing-users-masterThomas Müller2014-01-211-1/+1
|\
| * use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'Jörn Friedrich Dreyer2014-01-211-1/+1
| |
* | OC_Util::setupFS($user) will create a data dir for the given string - no ↵Thomas Müller2014-01-213-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-configThomas Müller2014-01-204-5/+14
|\ | | | | Load a separate config (if present) when running unit tests
| * Move test config folder to tests/configRobin Appelman2014-01-201-2/+2
| |
| * Load a separate config (if present) when running unit testsRobin Appelman2014-01-174-5/+14
| |
* | Reuse the data retrieved from the cache in checkUpdateRobin Appelman2014-01-202-4/+7
| |
* | Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfixVincent Petry2014-01-201-1/+1
|\ \ | | | | | | Fixed quota wrapper to not wrap failed fopen streams
| * | Fixed quota wrapper to not wrap failed fopen streamsVincent Petry2014-01-191-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_proxyThomas Müller2014-01-191-0/+5
|\ \ \ | |/ / |/| | Fix internet detection to use OC_Util::getUrlContent
| * | Disabled internet checking as mentioned when in proxy modeJoan2014-01-101-0/+5
| | |
* | | Merge pull request #6784 from owncloud/fix-activation-of-unknown-appsMorris Jobke2014-01-181-0/+3
|\ \ \ | | | | | | | | Fix activation of unknown apps
| * | | error handling in case a requested app doesn't existsThomas Müller2014-01-151-0/+3
| | | |
* | | | show link to app documentationBjoern Schiessle2014-01-171-0/+4
| |_|/ |/| |
* | | Merge pull request #6644 from ben-denham/unshare-all-fixBjörn Schießle2014-01-161-1/+9
|\ \ \ | |/ / |/| | \OCP\Share::unshareAll() fix
| * | Unshare all will now delete all shares for the item, instead of only for a ↵ben-denham2014-01-061-1/+9
| | | | | | | | | | | | single owner.
* | | Merge pull request #6744 from owncloud/fix_ocs_response_messagesThomas Müller2014-01-151-20/+22
|\ \ \ | | | | | | | | keep response message
| * | | keep response messageBjoern Schiessle2014-01-131-20/+22
| | | |
* | | | Merge pull request #6768 from owncloud/scanner-use-storage-mtimeVincent Petry2014-01-151-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 scanningRobin Appelman2014-01-141-1/+1
| | | | |
* | | | | Merge pull request #6704 from owncloud/encryptedfoldersizecalcVincent Petry2014-01-141-5/+17
|\ \ \ \ \ | |/ / / / |/| | | | Fix calculated folder size to use unencrypted size
| * | | | Fix calculated folder size to use unencrypted sizeVincent Petry2014-01-091-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 transifexThomas Müller2014-01-131-12/+0
| | | | |
* | | | | fixing typo in redirection query stringst3so2014-01-121-1/+1
| |/ / / |/| | |
* | | | Merge pull request #6687 from owncloud/sharing-fixpartfilehandlingVincent Petry2014-01-091-1/+4
|\ \ \ \ | | | | | | | | | | Removed special handling of part files in shared storage rename
| * | | | Removed special handling of part files in shared storage renameVincent Petry2014-01-081-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 consistentThomas Müller2014-01-091-2/+2
| | | | |
* | | | | set login name within apache auth backendThomas Müller2014-01-091-0/+2
| | | | |
* | | | | fixing PHPDoc and use cameCase namesThomas Müller2014-01-091-7/+7
| |/ / / |/| | |
* | | | Merge pull request #6681 from owncloud/userreportblizzz2014-01-084-7/+56
|\ \ \ \ | | | | | | | | | | add command line option to get user number statistics
| * | | | Infowarning about 32bitArthur Schiwon2014-01-081-0/+1
| | | | |
| * | | | add tests for user countingArthur Schiwon2014-01-081-0/+9
| | | | |
| * | | | if backends have the same class name, sum their users up instead of overwritingArthur Schiwon2014-01-081-1/+5
| | | | |
| * | | | Introduce user count action to user managementArthur Schiwon2014-01-073-7/+42
| | | | |
* | | | | Fix ownCloud for php5.3.xThomas Müller2014-01-081-1/+2
| | | | |
* | | | | Prevent deleting storage rootVincent Petry2014-01-081-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_pagespeedThomas Müller2014-01-081-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #6673 from ↵Vincent Petry2014-01-081-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 -1Vincent Petry2014-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes #6526
* | | | | turn off mod_pagespeedThomas Müller2014-01-081-0/+3
|/ / / /
* | | | Merge pull request #6594 from owncloud/kill-index.php-from-urlJörn Friedrich Dreyer2014-01-073-4/+28
|\ \ \ \ | |/ / / |/| | | Kill index.php from url
| * | | use getAppWebPath() in here as wellThomas Müller2013-12-311-1/+1
| | | |
| * | | new config parameter 'front_controller_active' which will instruct the url ↵Thomas Müller2013-12-312-3/+27
| | | | | | | | | | | | | | | | generator to generate urls without index.php
* | | | Merge pull request #6660 from owncloud/fixing-disabled-function-checksThomas Müller2014-01-073-4/+6
|\ \ \ \ | | | | | | | | | | Fixing disabled function checks
| * | | | trimming all array elementsThomas Müller2014-01-071-1/+3
| | | | |
| * | | | we shall explode on ',' onlyThomas Müller2014-01-071-1/+1
| | | | |
| * | | | reuse existing helper function OC_Helper::is_function_enabledThomas Müller2014-01-072-2/+2
| | | | |
* | | | | Merge pull request #6290 from owncloud/files-androidcontentdispositionThomas Müller2014-01-074-6/+47
|\ \ \ \ \ | | | | | | | | | | | | Files androidcontentdisposition
| * | | | | Added isUserAgent() method to requestVincent Petry2013-12-192-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 dispositionVincent Petry2013-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #5807