summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added Javascript unit testsVincent Petry2014-01-1611-2/+4812
* Merge pull request #6713 from owncloud/files-filenameescapingfixesLukas Reschke2014-01-129-50/+75
|\
| * Fixed various file name escaping issues in core appsVincent Petry2014-01-109-50/+75
|/
* Merge pull request #6687 from owncloud/sharing-fixpartfilehandlingVincent Petry2014-01-092-22/+16
|\
| * Removed special handling of part files in shared storage renameVincent Petry2014-01-082-22/+16
* | Merge pull request #6693 from owncloud/fixing-apache-loginThomas Müller2014-01-093-9/+11
|\ \
| * | 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-0811-35/+391
|\ \
| * | Infowarning about 32bitArthur Schiwon2014-01-081-0/+1
| * | add tests for user countingArthur Schiwon2014-01-082-0/+81
| * | if backends have the same class name, sum their users up instead of overwritingArthur Schiwon2014-01-081-1/+5
| * | LDAP: add tests for countUsersArthur Schiwon2014-01-081-0/+54
| * | remove unnecessary lineArthur Schiwon2014-01-081-1/+0
| * | LDAP: implement userCount action. This required to (finally) clean up and ref...Arthur Schiwon2014-01-083-28/+148
| * | Add command line tool to show numbers of users and user directoriesArthur Schiwon2014-01-072-0/+62
| * | Introduce user count action to user managementArthur Schiwon2014-01-073-7/+42
* | | Merge pull request #6686 from owncloud/fixes-6685-masterJan-Christoph Borchardt2014-01-081-1/+2
|\ \ \
| * | | Fix ownCloud for php5.3.xThomas Müller2014-01-081-1/+2
|/ / /
* | | Merge pull request #6680 from owncloud/core-preventunlinkstoragerootThomas Müller2014-01-082-0/+55
|\ \ \ | |_|/ |/| |
| * | Prevent deleting storage rootVincent Petry2014-01-082-0/+55
|/ /
* | Merge pull request #6515 from owncloud/autotest-enforcephpunitversionThomas Müller2014-01-081-2/+17
|\ \
| * | Enforce required phpunit versionVincent Petry2013-12-191-2/+17
* | | Merge pull request #6675 from owncloud/disable-mod_pagespeedVincent Petry2014-01-082-0/+6
|\ \ \
| * \ \ Merge branch 'master' into disable-mod_pagespeedThomas Müller2014-01-0826-139/+192
| |\ \ \
| * | | | turn off mod_pagespeedThomas Müller2014-01-082-0/+6
* | | | | Merge pull request #5238 from owncloud/externalstorage-owncloudbackendThomas Müller2014-01-086-9/+109
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added ownCloud backend for external storageVincent Petry2013-10-096-9/+109
* | | | | Merge pull request #6677 from owncloud/fixing-3rdparty-submoduleThomas Müller2014-01-081-0/+0
|\ \ \ \ \
| * | | | | Fix submodule 3rdparty - translation sync broke thatThomas Müller2014-01-081-0/+0
* | | | | | Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfil...Vincent Petry2014-01-082-7/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Now also preventing to override "files" dir size with -1Vincent Petry2014-01-072-7/+13
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-0824-132/+179
| |_|/ / / |/| | | |
* | | | | Merge pull request #6594 from owncloud/kill-index.php-from-urlJörn Friedrich Dreyer2014-01-074-5/+30
|\ \ \ \ \
| * | | | | 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
| * | | | | avoid conflict with physical file config.jsThomas Müller2013-12-311-1/+2
* | | | | | Merge pull request #6565 from owncloud/enable-ldap-unit-tests-master-2Thomas Müller2014-01-071-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | enable ldap testsThomas Müller2013-12-241-0/+1
* | | | | | 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-078-69/+99
|\ \ \ \ \ \ \
| * | | | | | | Added isUserAgent() method to requestVincent Petry2013-12-193-2/+74
| * | | | | | | Added workaround for Android content dispositionVincent Petry2013-12-101-1/+2
| * | | | | | | Moved content disposition code+workarounds to OCP\ResponseVincent Petry2013-12-106-69/+26
* | | | | | | | Merge pull request #6642 from owncloud/update-SabreDAVThomas Müller2014-01-072-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove @ in order to get proper error handlingThomas Müller2014-01-071-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 05:22:01 +0000