Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16440 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-05-19 | 20 | -42/+0 |
|\ | | | | | Scrutinizer Auto-Fixes | ||||
| * | Re-add use statement | Morris Jobke | 2015-05-19 | 1 | -0/+1 |
| | | |||||
| * | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-05-19 | 21 | -43/+0 |
| | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | 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 | ||||
| * | | 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 user/group backends to a minimum | ||||
| * | | 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 ↵ | Thomas Müller | 2015-05-19 | 2 | -9/+78 |
|\ \ \ | |_|/ |/| | | | | | | | | owncloud/fix-group-list-and-count-primary-group-only Fixes returns of group memberships and counting if all members have the ... | ||||
| * | | 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 ↵ | Arthur Schiwon | 2015-05-19 | 2 | -9/+77 |
| | | | | | | | | | | | | specific groups as primary set. | ||||
* | | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith | Thomas Müller | 2015-05-19 | 2 | -4/+6 |
|\ \ \ | | | | | | | | | Remove hard coded limit of 15 from getShareWith | ||||
| * | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | Conditional logging | Morris Jobke | 2015-05-08 | 3 | -7/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Log condition for log level increase based on conditions. Once one of these conditions is met, the required log level is set to debug. This allows to debug specific requests, users or apps * Supported conditions (setting `log_condition` in `config.php`): - `shared_secret`: if a request parameter with the name `log_secret` is set to this value the condition is met - `users`: if the current request is done by one of the specified users, this condition is met - `apps`: if the log message is invoked by one of the specified apps, this condition is met * fix unit test and add app log condition test | ||||
| * | | | | Move log level check to logger parent class | Morris Jobke | 2015-05-08 | 4 | -45/+45 |
| | | | | | | | | | | | | | | | | | | | | * remove duplicate code from child classes | ||||
* | | | | | Merge pull request #16085 from owncloud/encryption-module-rename | Thomas Müller | 2015-05-19 | 5 | -6/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | rename to 'Default encryption module' | ||||
| * | | | | | 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 | ||||
| * | | | | | Show a empty response for GET on non-files instead of the Browser Plugin | Lukas Reschke | 2015-05-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | As discussed in https://github.com/owncloud/core/pull/14151, we missed to add this to the `files_sharing` S2S public WebDAV backend though. | ||||
* | | | | | | Merge pull request #16181 from owncloud/fix-15982 | Morris Jobke | 2015-05-19 | 6 | -14/+78 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | catch unallowed anonymous auth attempt and show specific error | ||||
| * | | | | | | 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 ↵ | Arthur Schiwon | 2015-05-18 | 3 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | generic. AD uses is for uses not enlisted in the RFC, like on issues with anonymous binds. we also try to guess this case and show a hint. | ||||
| * | | | | | | 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 | ||||
| * | | | | | | | Mute XCache error when trying to clear the opcode cache | Lukas Reschke | 2015-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://github.com/owncloud/core/issues/16287: > This is caused by XCache at https://github.com/owncloud/core/blob/8e59d4c64b48ed7daeebb714e11213f7a22b5740/lib/private/util.php#L1276 where we are trying to reset the opcode cache with `XC_TYPE_PHP`. > I suspect that while XCache is installed its opcode component is not used. Unfortunately, the XCache API is not really properly documented and thus I don't know what API we would have to call to check whether the `XC_TYPE_PHP` cache is populated. In fact, there is an [open XCache bug](http://xcache.lighttpd.net/ticket/176) since 7 years that discusses this problem and is likely to never get fixed since XCache is abandonware. Fixes https://github.com/owncloud/core/issues/16287 | ||||
* | | | | | | | | 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 | ||||
| * | | | | | | | | Add hint about additional PHP database modules | Morris Jobke | 2015-05-18 | 3 | -1/+11 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | * fixes #16391 | ||||
* | | | | | | | | [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 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | fix #16356 | ||||
| * | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation | ||||
| * | | | | | | | 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 parameter to constructor | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [encryption] only try to delete file keys if it is a valid path | ||||
| * | | | | | | | 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 | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix bug #15973 | ||||
| * | | | | | | | | correct testSeek | jknockaert | 2015-05-18 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | work on tests | jknockaert | 2015-05-18 | 1 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests reorganised and extended | ||||
| * | | | | | | | | fix #15973 | jknockaert | 2015-04-30 | 1 | -9/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework of stream_seek handling; there where basically two bugs: 1. seeking to the end of the current file would fail (with SEEK_SET); and 2. if seeking to an undefined position (outside 0,unencryptedSize) then newPosition was not defined. I used the opportunity to simplify the code. | ||||
* | | | | | | | | | 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 | ||||
| * | | | | | | | | | 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 | ||||
| * | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | redirect to error page if download failed |