summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Useless else removedtsumi2014-01-151-2/+0
| | | As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922
* Added SVG fallback to apps settings popuptsumi2014-01-101-0/+5
| | | | This fix issue of calendar app with IE8, see issue report for details: https://github.com/owncloud/calendar/issues/291
* Merge pull request #6687 from owncloud/sharing-fixpartfilehandlingVincent Petry2014-01-092-22/+16
|\ | | | | Removed special handling of part files in shared storage rename
| * Removed special handling of part files in shared storage renameVincent Petry2014-01-082-22/+16
| | | | | | | | | | | | 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.
* | Merge pull request #6693 from owncloud/fixing-apache-loginThomas Müller2014-01-093-9/+11
|\ \ | | | | | | Fixing apache login
| * | 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
|\ \ | | | | | | add command line option to get user number statistics
| * | 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 ↵Arthur Schiwon2014-01-083-28/+148
| | | | | | | | | | | | refactor the search method, which will have a positive performance impact on paged search.
| * | 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.x
| * | | 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 root
| * | Prevent deleting storage rootVincent Petry2014-01-082-0/+55
|/ / | | | | | | | | | | | | | | 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 pull request #6515 from owncloud/autotest-enforcephpunitversionThomas Müller2014-01-081-2/+17
|\ \ | | | | | | Enforce required phpunit version
| * | Enforce required phpunit versionVincent Petry2013-12-191-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_pagespeedVincent Petry2014-01-082-0/+6
|\ \ \ | | | | | | | | turn off mod_pagespeed
| * \ \ 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 storage
| * | | | Added ownCloud backend for external storageVincent Petry2013-10-096-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-submoduleThomas Müller2014-01-081-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Fix submodule 3rdparty - translation sync broke that
| * | | | | Fix submodule 3rdparty - translation sync broke thatThomas Müller2014-01-081-0/+0
| | | | | |
* | | | | | Merge pull request #6673 from ↵Vincent Petry2014-01-082-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 -1Vincent Petry2014-01-072-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #6526
* | | | | | [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
|\ \ \ \ \ | | | | | | | | | | | | 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
| * | | | | 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 tests
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | 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-078-69/+99
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Files androidcontentdisposition
| * | | | | | | Added isUserAgent() method to requestVincent Petry2013-12-193-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 dispositionVincent Petry2013-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5807
| * | | | | | | Moved content disposition code+workarounds to OCP\ResponseVincent Petry2013-12-106-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-SabreDAVThomas Müller2014-01-072-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update sabre dav to 1.7.9
| * | | | | | | | Remove @ in order to get proper error handlingThomas Müller2014-01-071-1/+1
| | | | | | | | |
| * | | | | | | | reference 3rdparty branch with SabreDAV 1.7.9 installed using composerThomas Müller2014-01-051-0/+0
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 07:09:04 +0000