aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6759 from owncloud/extstorage-smbtimezonefixVincent Petry2014-01-141-1/+1
|\ | | | | Fixed timezone issue with SMB storage
| * Fixed timezone issue with SMB storageVincent Petry2014-01-141-1/+1
| | | | | | | | Now forcing smbclient to also run on UTC
* | Merge pull request #6767 from owncloud/sharing_error_messagesBjörn Schießle2014-01-141-1/+1
|\ \ | | | | | | it is not an urgent error... a DEBUG message is enough at this point
| * | it is not an urgent error... a DEBUG message is enough at this pointBjoern Schiessle2014-01-141-1/+1
| | |
* | | Merge pull request #6752 from owncloud/silence-test-listenerThomas Müller2014-01-131-3/+3
|\ \ \ | |/ / |/| | no warnings within unlinkDir() within the TestCleanupListener
| * | no warnings within unlinkDir() within the TestCleanupListenerThomas Müller2014-01-131-3/+3
| | |
* | | Merge pull request #6755 from owncloud/remove-ru_RU-masterAndreas Fischer2014-01-1419-3359/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove ru_RU - it has bee removed from transifex * owncloud/remove-ru_RU-master: remove ru_RU - it has bee removed from transifex
| * | | remove ru_RU - it has bee removed from transifexThomas Müller2014-01-1319-3359/+0
| | | |
* | | | don't unshare on deleteBjoern Schiessle2014-01-131-8/+0
|/ / /
* | | Merge pull request #6422 from ↵Vincent Petry2014-01-132-16/+32
|\ \ \ | | | | | | | | | | | | | | | | ccerrillo/fixing-6301-external-mount-webdav-blank-files Fixing Issue #6301 on master branch
| * | | Fix ```createCertificateBundle``` and ```getCertificates``` methodsCarlos Cerrillo2013-12-171-4/+2
| | | | | | | | | | | | | | | | | | | | from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the path
| * | | Fixing tab/space coding styleCarlos Cerrillo2013-12-171-17/+21
| | | | | | | | | | | | | | | | Only set SSL things when ```$this->secure``` is ```true```
| * | | Fixing Issue #6301 on master branchCarlos Cerrillo2013-12-151-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added private var $certPath to store the user root cert Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome() Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files
* | | | Merge pull request #6734 from st3so/redirectfixFrank Karlitschek2014-01-131-1/+1
|\ \ \ \ | |_|/ / |/| | | fixing typo in redirection query string
| * | | fixing typo in redirection query stringst3so2014-01-121-1/+1
| | | |
* | | | Merge pull request #6694 from owncloud/fix-email-template-l10nThomas Müller2014-01-131-1/+1
|\ \ \ \ | |_|_|/ |/| | | fix email template l10n, emphasize filename
| * | | fix email template l10n, emphasize filenameJan-Christoph Borchardt2014-01-091-1/+1
| | | |
* | | | Merge pull request #6713 from owncloud/files-filenameescapingfixesLukas Reschke2014-01-129-50/+75
|\ \ \ \ | |_|/ / |/| | | Fixed various file name escaping issues in core apps
| * | | Fixed various file name escaping issues in core appsVincent Petry2014-01-109-50/+75
|/ / / | | | | | | | | | | | | | | | | | | - Refactored file tr lookup into FileList.findFileEl that uses filterAttr to avoid escaping issues in jQuery selectors - Fixed versions and sharing app to properly escape file names in attributes
* | | 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
| |_|/ / / / |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-27 15:39:27 +0000