Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clean-up of orthography, grammar | Christian Hoffmann | 2015-05-19 | 1 | -2/+2 |
* | Merge pull request #16447 from owncloud/fix-minor-code-problems | Thomas Müller | 2015-05-19 | 2 | -2/+2 |
|\ | |||||
| * | Fix unexisting class and broken doc | Joas Schilling | 2015-05-19 | 2 | -2/+2 |
* | | Merge pull request #16419 from owncloud/user-group-backend-performance | Thomas Müller | 2015-05-19 | 2 | -11/+47 |
|\ \ | |||||
| * | | Reduce the complexity of the search queries in the backends to a minimum | Joas Schilling | 2015-05-18 | 2 | -11/+47 |
* | | | Merge pull request #15606 from owncloud/fix-group-list-and-count-primary-grou... | Thomas Müller | 2015-05-19 | 2 | -9/+78 |
|\ \ \ | |_|/ |/| | | |||||
| * | | add primary group users to resultset before caching | Arthur Schiwon | 2015-05-19 | 1 | -1/+2 |
| * | | Fixes returns of group memberships and counting if all members have the speci... | Arthur Schiwon | 2015-05-19 | 2 | -9/+77 |
* | | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith | Thomas Müller | 2015-05-19 | 2 | -4/+6 |
|\ \ \ | |||||
| * | | | add support for limit request parameter to getShareWith | Craig Morrissey | 2015-05-15 | 2 | -4/+6 |
* | | | | Merge pull request #16420 from owncloud/update-useconfigtableprefix | Morris Jobke | 2015-05-19 | 1 | -1/+28 |
|\ \ \ \ | |||||
| * | | | | Add unit test for migrator with different prefix | Vincent Petry | 2015-05-19 | 1 | -1/+28 |
* | | | | | Merge pull request #15965 from owncloud/conditional-logging | Thomas Müller | 2015-05-19 | 6 | -50/+156 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Conditional logging | Morris Jobke | 2015-05-08 | 3 | -7/+113 |
| * | | | | Move log level check to logger parent class | Morris Jobke | 2015-05-08 | 4 | -45/+45 |
* | | | | | Merge pull request #16085 from owncloud/encryption-module-rename | Thomas Müller | 2015-05-19 | 5 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | rename to 'Default encryption module' | Jan-Christoph Borchardt | 2015-05-06 | 5 | -6/+6 |
* | | | | | | Merge pull request #16354 from owncloud/remove-browser-from-publicwebdav | Joas Schilling | 2015-05-19 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Show a empty response for GET on non-files instead of the Browser Plugin | Lukas Reschke | 2015-05-14 | 1 | -1/+2 |
* | | | | | | Merge pull request #16181 from owncloud/fix-15982 | Morris Jobke | 2015-05-19 | 6 | -14/+78 |
|\ \ \ \ \ \ | |||||
| * | | | | | | handle unallowed auth exception on port detection | Arthur Schiwon | 2015-05-18 | 2 | -6/+20 |
| * | | | | | | throw exception on LDAP error 1, which we usually do not see and is pretty ge... | Arthur Schiwon | 2015-05-18 | 3 | -0/+25 |
| * | | | | | | catch unallowed anonymous auth attempt and show specific error | Arthur Schiwon | 2015-05-18 | 5 | -9/+34 |
* | | | | | | | Merge pull request #16293 from owncloud/xcache | Morris Jobke | 2015-05-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Mute XCache error when trying to clear the opcode cache | Lukas Reschke | 2015-05-12 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #16426 from owncloud/add-database-setup-hint | Morris Jobke | 2015-05-19 | 3 | -1/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add hint about additional PHP database modules | Morris Jobke | 2015-05-18 | 3 | -1/+11 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-19 | 2 | -0/+2 |
* | | | | | | | | Merge pull request #16412 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 2 | -3/+11 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | add a unit test to make sure that we don't try to read a file during a write ... | Bjoern Schiessle | 2015-05-18 | 1 | -2/+10 |
| * | | | | | | | fix #16356 | jknockaert | 2015-05-18 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #16405 from owncloud/enc_add_missing_parameter | Joas Schilling | 2015-05-18 | 3 | -4/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add missing import for the exception | Joas Schilling | 2015-05-18 | 2 | -0/+3 |
| * | | | | | | | Add a unit test for the decrypt method | Joas Schilling | 2015-05-18 | 1 | -1/+11 |
| * | | | | | | | add l10n to constructor | Bjoern Schiessle | 2015-05-18 | 3 | -4/+18 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #16399 from owncloud/enc_rmdir_fix | Clark Tomlinson | 2015-05-18 | 2 | -9/+80 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | only try to delete file keys if it is a valid path | Bjoern Schiessle | 2015-05-18 | 2 | -9/+80 |
* | | | | | | | | Merge pull request #16403 from owncloud/fix-command-loading | Thomas Müller | 2015-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Only load commands of enabled apps | Morris Jobke | 2015-05-18 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #15980 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 2 | -19/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | correct testSeek | jknockaert | 2015-05-18 | 1 | -4/+4 |
| * | | | | | | | | work on tests | jknockaert | 2015-05-18 | 1 | -10/+11 |
| * | | | | | | | | fix #15973 | jknockaert | 2015-04-30 | 1 | -9/+7 |
* | | | | | | | | | Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash | Vincent Petry | 2015-05-18 | 2 | -1/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | also encrypt files in trash bin | Bjoern Schiessle | 2015-05-18 | 2 | -1/+29 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #16398 from owncloud/fix-php-docv8.1.0beta2 | Joas Schilling | 2015-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix PHPDoc of public interface ILockingProvider | Morris Jobke | 2015-05-18 | 1 | -1/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #16243 from owncloud/error_if_download_failed | Vincent Petry | 2015-05-18 | 14 | -56/+208 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 14 | -56/+208 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #16364 from owncloud/add-warning-webdav | Morris Jobke | 2015-05-18 | 2 | -3/+80 |
|\ \ \ \ \ \ \ \ |