summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* error handling in case a requested app doesn't existsThomas Müller2014-01-151-0/+3
* Merge pull request #6744 from owncloud/fix_ocs_response_messagesThomas Müller2014-01-151-20/+22
|\
| * 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 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 sizeVincent Petry2014-01-091-5/+17
* | | 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 renameVincent Petry2014-01-081-1/+4
* | | 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
|\ \
| * | 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
| |/ |/|
* | Merge branch 'master' into disable-mod_pagespeedThomas Müller2014-01-081-1/+1
|\ \
| * \ Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfil...Vincent Petry2014-01-081-1/+1
| |\ \
| | * | Now also preventing to override "files" dir size with -1Vincent Petry2014-01-071-1/+1
* | | | 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
|\ \ \ | |/ / |/| |
| * | use getAppWebPath() in here as wellThomas Müller2013-12-311-1/+1
| * | new config parameter 'front_controller_active' which will instruct the url ge...Thomas Müller2013-12-312-3/+27
* | | Merge pull request #6660 from owncloud/fixing-disabled-function-checksThomas Müller2014-01-073-4/+6
|\ \ \
| * | | 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
|\ \ \ \
| * | | | Added isUserAgent() method to requestVincent Petry2013-12-192-2/+24
| * | | | Added workaround for Android content dispositionVincent Petry2013-12-101-1/+2
| * | | | Moved content disposition code+workarounds to OCP\ResponseVincent Petry2013-12-103-6/+24
* | | | | Merge pull request #6642 from owncloud/update-SabreDAVThomas Müller2014-01-071-2/+6
|\ \ \ \ \
| * | | | | Remove @ in order to get proper error handlingThomas Müller2014-01-071-1/+1
| * | | | | require composer's autoload.php if presentThomas Müller2014-01-051-2/+6
* | | | | | Merge pull request #6663 from owncloud/fix_empty_mimetypesThomas Müller2014-01-071-2/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | remove duplicate exe mimetype, add correct msi mimetypeJörn Friedrich Dreyer2014-01-071-2/+1
* | | | | | Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-...Thomas Müller2014-01-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | in order to work properly with encryption ocTransferId is added to the file p...Thomas Müller2014-01-071-1/+1
| * | | | | Adding a random postfix to the part file.Thomas Müller2013-12-201-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-071-0/+8
| |_|_|_|/ |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-062-2/+9
* | | | | Merge pull request #6031 from s0taka/masterMorris Jobke2014-01-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | No decimal points for Kilobyte and Byte #5371.Simon Könnecke2013-11-251-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-051-0/+2
* | | | | Merge pull request #6610 from owncloud/apcu-clearicewind19912014-01-031-1/+1
|\ \ \ \ \