summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use storage_mtime when determining if we can reuse cached data while scanningRobin Appelman2014-01-143-2/+25
* Merge pull request #6752 from owncloud/silence-test-listenerThomas Müller2014-01-131-3/+3
|\
| * 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 transifexThomas Müller2014-01-1319-3359/+0
* | | don't unshare on deleteBjoern Schiessle2014-01-131-8/+0
|/ /
* | Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-bla...Vincent Petry2014-01-132-16/+32
|\ \
| * | Fix ```createCertificateBundle``` and ```getCertificates``` methodsCarlos Cerrillo2013-12-171-4/+2
| * | Fixing tab/space coding styleCarlos Cerrillo2013-12-171-17/+21
| * | Fixing Issue #6301 on master branchCarlos Cerrillo2013-12-151-6/+20
* | | Merge pull request #6734 from st3so/redirectfixFrank Karlitschek2014-01-131-1/+1
|\ \ \ | |_|/ |/| |
| * | 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 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 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