Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | remove unused variables | Arthur Schiwon | 2014-01-14 | 1 | -2/+2 | |
* | | | | | | | | | LDAP: fix TLS detection | Arthur Schiwon | 2014-01-14 | 1 | -2/+5 | |
* | | | | | | | | | Merge pull request #6704 from owncloud/encryptedfoldersizecalc | Vincent Petry | 2014-01-14 | 2 | -5/+62 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix calculated folder size to use unencrypted size | Vincent Petry | 2014-01-09 | 2 | -5/+62 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6759 from owncloud/extstorage-smbtimezonefix | Vincent Petry | 2014-01-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fixed timezone issue with SMB storage | Vincent Petry | 2014-01-14 | 1 | -1/+1 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6767 from owncloud/sharing_error_messages | Björn Schießle | 2014-01-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | it is not an urgent error... a DEBUG message is enough at this point | Bjoern Schiessle | 2014-01-14 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #6752 from owncloud/silence-test-listener | Thomas Müller | 2014-01-13 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | no warnings within unlinkDir() within the TestCleanupListener | Thomas Müller | 2014-01-13 | 1 | -3/+3 | |
* | | | | | | | | | Merge pull request #6755 from owncloud/remove-ru_RU-master | Andreas Fischer | 2014-01-14 | 19 | -3359/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove ru_RU - it has bee removed from transifex | Thomas Müller | 2014-01-13 | 19 | -3359/+0 | |
* | | | | | | | | | | don't unshare on delete | Bjoern Schiessle | 2014-01-13 | 1 | -8/+0 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-bla... | Vincent Petry | 2014-01-13 | 2 | -16/+32 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix ```createCertificateBundle``` and ```getCertificates``` methods | Carlos Cerrillo | 2013-12-17 | 1 | -4/+2 | |
| * | | | | | | | | | Fixing tab/space coding style | Carlos Cerrillo | 2013-12-17 | 1 | -17/+21 | |
| * | | | | | | | | | Fixing Issue #6301 on master branch | Carlos Cerrillo | 2013-12-15 | 1 | -6/+20 | |
* | | | | | | | | | | Merge pull request #6734 from st3so/redirectfix | Frank Karlitschek | 2014-01-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | fixing typo in redirection query string | st3so | 2014-01-12 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6694 from owncloud/fix-email-template-l10n | Thomas Müller | 2014-01-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fix email template l10n, emphasize filename | Jan-Christoph Borchardt | 2014-01-09 | 1 | -1/+1 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #6713 from owncloud/files-filenameescapingfixes | Lukas Reschke | 2014-01-12 | 9 | -50/+75 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fixed various file name escaping issues in core apps | Vincent Petry | 2014-01-10 | 9 | -50/+75 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #6687 from owncloud/sharing-fixpartfilehandling | Vincent Petry | 2014-01-09 | 2 | -22/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Removed special handling of part files in shared storage rename | Vincent Petry | 2014-01-08 | 2 | -22/+16 | |
* | | | | | | | | Merge pull request #6693 from owncloud/fixing-apache-login | Thomas Müller | 2014-01-09 | 3 | -9/+11 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | rename user-id to loginname to stay consistent | Thomas Müller | 2014-01-09 | 1 | -2/+2 | |
| * | | | | | | | set login name within apache auth backend | Thomas Müller | 2014-01-09 | 1 | -0/+2 | |
| * | | | | | | | fixing PHPDoc and use cameCase names | Thomas Müller | 2014-01-09 | 1 | -7/+7 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #6681 from owncloud/userreport | blizzz | 2014-01-08 | 11 | -35/+391 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Infowarning about 32bit | Arthur Schiwon | 2014-01-08 | 1 | -0/+1 | |
| * | | | | | | | add tests for user counting | Arthur Schiwon | 2014-01-08 | 2 | -0/+81 | |
| * | | | | | | | if backends have the same class name, sum their users up instead of overwriting | Arthur Schiwon | 2014-01-08 | 1 | -1/+5 | |
| * | | | | | | | LDAP: add tests for countUsers | Arthur Schiwon | 2014-01-08 | 1 | -0/+54 | |
| * | | | | | | | remove unnecessary line | Arthur Schiwon | 2014-01-08 | 1 | -1/+0 | |
| * | | | | | | | LDAP: implement userCount action. This required to (finally) clean up and ref... | Arthur Schiwon | 2014-01-08 | 3 | -28/+148 | |
| * | | | | | | | Add command line tool to show numbers of users and user directories | Arthur Schiwon | 2014-01-07 | 2 | -0/+62 | |
| * | | | | | | | Introduce user count action to user management | Arthur Schiwon | 2014-01-07 | 3 | -7/+42 | |
* | | | | | | | | Merge pull request #6686 from owncloud/fixes-6685-master | Jan-Christoph Borchardt | 2014-01-08 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix ownCloud for php5.3.x | Thomas Müller | 2014-01-08 | 1 | -1/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #6680 from owncloud/core-preventunlinkstorageroot | Thomas Müller | 2014-01-08 | 2 | -0/+55 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Prevent deleting storage root | Vincent Petry | 2014-01-08 | 2 | -0/+55 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #6515 from owncloud/autotest-enforcephpunitversion | Thomas Müller | 2014-01-08 | 1 | -2/+17 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Enforce required phpunit version | Vincent Petry | 2013-12-19 | 1 | -2/+17 | |
* | | | | | | | | Merge pull request #6675 from owncloud/disable-mod_pagespeed | Vincent Petry | 2014-01-08 | 2 | -0/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into disable-mod_pagespeed | Thomas Müller | 2014-01-08 | 26 | -139/+192 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | turn off mod_pagespeed | Thomas Müller | 2014-01-08 | 2 | -0/+6 | |
* | | | | | | | | | | Merge pull request #5238 from owncloud/externalstorage-owncloudbackend | Thomas Müller | 2014-01-08 | 6 | -9/+109 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Added ownCloud backend for external storage | Vincent Petry | 2013-10-09 | 6 | -9/+109 | |
* | | | | | | | | | | Merge pull request #6677 from owncloud/fixing-3rdparty-submodule | Thomas Müller | 2014-01-08 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ |