summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16440 from owncloud/scrutinizer-patch-1Thomas Müller2015-05-1920-42/+0
|\ | | | | Scrutinizer Auto-Fixes
| * Re-add use statementMorris Jobke2015-05-191-0/+1
| |
| * Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-05-1921-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-problemsThomas Müller2015-05-192-2/+2
|\ \ | | | | | | Fix unexisting class and broken doc
| * | Fix unexisting class and broken docJoas Schilling2015-05-192-2/+2
| |/
* | Merge pull request #16419 from owncloud/user-group-backend-performanceThomas Müller2015-05-192-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 minimumJoas Schilling2015-05-182-11/+47
| | |
* | | Merge pull request #15606 from ↵Thomas Müller2015-05-192-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 cachingArthur Schiwon2015-05-191-1/+2
| | |
| * | Fixes returns of group memberships and counting if all members have the ↵Arthur Schiwon2015-05-192-9/+77
| | | | | | | | | | | | specific groups as primary set.
* | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewithThomas Müller2015-05-192-4/+6
|\ \ \ | | | | | | | | Remove hard coded limit of 15 from getShareWith
| * | | add support for limit request parameter to getShareWithCraig Morrissey2015-05-152-4/+6
| | | |
* | | | Merge pull request #16420 from owncloud/update-useconfigtableprefixMorris Jobke2015-05-191-1/+28
|\ \ \ \ | | | | | | | | | | Add unit test for migrator with different prefix
| * | | | Add unit test for migrator with different prefixVincent Petry2015-05-191-1/+28
| | | | |
* | | | | Merge pull request #15965 from owncloud/conditional-loggingThomas Müller2015-05-196-50/+156
|\ \ \ \ \ | |_|_|/ / |/| | | | Conditional logging
| * | | | Conditional loggingMorris Jobke2015-05-083-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 classMorris Jobke2015-05-084-45/+45
| | | | | | | | | | | | | | | | | | | | * remove duplicate code from child classes
* | | | | Merge pull request #16085 from owncloud/encryption-module-renameThomas Müller2015-05-195-6/+6
|\ \ \ \ \ | | | | | | | | | | | | rename to 'Default encryption module'
| * | | | | rename to 'Default encryption module'Jan-Christoph Borchardt2015-05-065-6/+6
| | | | | |
* | | | | | Merge pull request #16354 from owncloud/remove-browser-from-publicwebdavJoas Schilling2015-05-191-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 PluginLukas Reschke2015-05-141-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-15982Morris Jobke2015-05-196-14/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | catch unallowed anonymous auth attempt and show specific error
| * | | | | | handle unallowed auth exception on port detectionArthur Schiwon2015-05-182-6/+20
| | | | | | |
| * | | | | | throw exception on LDAP error 1, which we usually do not see and is pretty ↵Arthur Schiwon2015-05-183-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 errorArthur Schiwon2015-05-185-9/+34
| | | | | | |
* | | | | | | Merge pull request #16293 from owncloud/xcacheMorris Jobke2015-05-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Mute XCache error when trying to clear the opcode cache
| * | | | | | | Mute XCache error when trying to clear the opcode cacheLukas Reschke2015-05-121-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-hintMorris Jobke2015-05-193-1/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add hint about additional PHP database modules
| * | | | | | | | Add hint about additional PHP database modulesMorris Jobke2015-05-183-1/+11
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * fixes #16391
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-192-0/+2
| | | | | | | |
* | | | | | | | Merge pull request #16412 from owncloud/jknockaert-patch-1Björn Schießle2015-05-182-3/+11
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | fix #16356
| * | | | | | | add a unit test to make sure that we don't try to read a file during a write ↵Bjoern Schiessle2015-05-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation
| * | | | | | | fix #16356jknockaert2015-05-181-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #16405 from owncloud/enc_add_missing_parameterJoas Schilling2015-05-183-4/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add missing parameter to constructor
| * | | | | | | Add missing import for the exceptionJoas Schilling2015-05-182-0/+3
| | | | | | | |
| * | | | | | | Add a unit test for the decrypt methodJoas Schilling2015-05-181-1/+11
| | | | | | | |
| * | | | | | | add l10n to constructorBjoern Schiessle2015-05-183-4/+18
| |/ / / / / /
* | | | | | | Merge pull request #16399 from owncloud/enc_rmdir_fixClark Tomlinson2015-05-182-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 pathBjoern Schiessle2015-05-182-9/+80
| | | | | | | |
* | | | | | | | Merge pull request #16403 from owncloud/fix-command-loadingThomas Müller2015-05-181-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Only load commands of enabled apps
| * | | | | | | Only load commands of enabled appsMorris Jobke2015-05-181-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #15980 from owncloud/jknockaert-patch-1Björn Schießle2015-05-182-19/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix bug #15973
| * | | | | | | | correct testSeekjknockaert2015-05-181-4/+4
| | | | | | | | |
| * | | | | | | | work on testsjknockaert2015-05-181-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Tests reorganised and extended
| * | | | | | | | fix #15973jknockaert2015-04-301-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_trashVincent Petry2015-05-182-1/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | also encrypt files in trash bin
| * | | | | | | | | also encrypt files in trash binBjoern Schiessle2015-05-182-1/+29
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #16398 from owncloud/fix-php-docv8.1.0beta2Joas Schilling2015-05-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix PHPDoc of public interface ILockingProvider
| * | | | | | | | | Fix PHPDoc of public interface ILockingProviderMorris Jobke2015-05-181-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #16243 from owncloud/error_if_download_failedVincent Petry2015-05-1814-56/+208
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | redirect to error page if download failed