summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-254-4/+8
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-244-0/+18
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-238-0/+26
|
* Merge pull request #16526 from owncloud/enc_fix_versions_webdav_uploadVincent Petry2015-05-221-1/+2
|\ | | | | remove part file extension before we read a filekey
| * remove part file extension before we read a filekey to reuse a existing key ↵Bjoern Schiessle2015-05-221-1/+2
| | | | | | | | if possible, otherwise stuff like versioning will break
* | Merge pull request #16493 from owncloud/cache-movewithcorrectmimetypeVincent Petry2015-05-221-1/+1
|\ \ | | | | | | Get correct mimetype when moving and changing extension
| * | Get correct mimetype when moving and changing extensionVincent Petry2015-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes issue when restoring folders from trash cross-storage, as such folders have an extension ".d12345678". Fixes issue when moving folders between storages and at the same time changing their extension.
* | | Merge pull request #16516 from owncloud/fix-phpdoc-traitJoas Schilling2015-05-225-4/+16
|\ \ \ | | | | | | | | Fix PHPDoc
| * | | Fix PHPDocLukas Reschke2015-05-225-4/+16
| | | | | | | | | | | | | | | | Use correct parameters
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2214-0/+28
| |_|/ |/| |
* | | Merge pull request #16499 from owncloud/fix-phpdoc-annotationsLukas Reschke2015-05-211-1/+1
|\ \ \ | | | | | | | | Fix PHPDoc :see_no_evil:
| * | | Fix PHPDoc :see_no_evil:Lukas Reschke2015-05-211-1/+1
| |/ / | | | | | | | | | *sigh*
* | | Merge pull request #16473 from owncloud/occ_16221Joas Schilling2015-05-211-4/+19
|\ \ \ | | | | | | | | occ option to update all third party apps without disable
| * | | Skip disable3rdParty AppsSteffen Lindner2015-05-201-4/+19
| | |/ | |/|
* / | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2170-94/+8
|/ /
* | Merge pull request #16322 from owncloud/trash-viewMorris Jobke2015-05-202-3/+20
|\ \ | | | | | | dont go trough the view when moving to trash
| * | use copy when doing a crossStorageCopy on the same storageRobin Appelman2015-05-192-3/+20
| | |
* | | Merge pull request #16075 from owncloud/skeleton-copy-delayVincent Petry2015-05-203-7/+13
|\ \ \ | |_|/ |/| | wait with copying the skeleton untill login and setupfs are done
| * | exception class will be logged as well - helps especially in cases where the ↵Thomas Müller2015-05-191-3/+9
| | | | | | | | | | | | message contained is empty - e.g. "message":"OCP\\Files\\NotFoundException: at \/home\/deepdiver\/Development\/ownCloud\/core-autotest\/apps\/provisioning_api\/lib\/users.php#354",
| * | wait with copying the skeleton untill login and setupfs are doneRobin Appelman2015-05-182-4/+4
| | |
* | | Merge pull request #16463 from owncloud/add-support-to-disallow-domainsJan-Christoph Borchardt2015-05-201-2/+110
|\ \ \ | | | | | | | | Add support for disallowing domains to the ContentSecurityPolicy
| * | | Add support for disallowing domains to the ContentSecurityPolicyLukas Reschke2015-05-201-2/+110
| | | | | | | | | | | | | | | | | | | | | | | | For enhanced security it is important that there is also a way to disallow domains, including the default ones. With this commit every method gets added a new "disallow" function.
* | | | Merge pull request #16453 from cmeh/patch-6Morris Jobke2015-05-201-2/+2
|\ \ \ \ | |/ / / |/| | | Clean-up of orthography, grammar
| * | | Clean-up of orthography, grammarChristian Hoffmann2015-05-191-2/+2
| | | | | | | | | | | | | | | | * Changed "instead to" to "instead of". * Changed "setup" to "set up" (past participle).
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2016-4/+22
| | | |
* | | | Merge pull request #16440 from owncloud/scrutinizer-patch-1Thomas Müller2015-05-197-26/+0
|\ \ \ \ | |/ / / |/| | | Scrutinizer Auto-Fixes
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-05-197-26/+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-191-1/+1
|\ \ \ \ | | | | | | | | | | Fix unexisting class and broken doc
| * | | | Fix unexisting class and broken docJoas Schilling2015-05-191-1/+1
| |/ / /
* | | | 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 #15965 from owncloud/conditional-loggingThomas Müller2015-05-194-47/+108
|\ \ \ \ | | | | | | | | | | Conditional logging
| * | | | Conditional loggingMorris Jobke2015-05-081-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-192-2/+2
|\ \ \ \ \ | | | | | | | | | | | | rename to 'Default encryption module'
| * | | | | rename to 'Default encryption module'Jan-Christoph Borchardt2015-05-062-2/+2
| | | | | |
* | | | | | 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 #16412 from owncloud/jknockaert-patch-1Björn Schießle2015-05-181-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | fix #16356
| * | | | | | fix #16356jknockaert2015-05-181-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #16399 from owncloud/enc_rmdir_fixClark Tomlinson2015-05-181-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | [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-181-2/+6
| | | | | | |
* | | | | | | 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-181-9/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix bug #15973
| * | | | | | | 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 #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-185-41/+105
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | redirect to error page if download failed
| * | | | | | a new approach to display the error messageBjoern Schiessle2015-05-185-41/+105
| | |/ / / / | |/| | | |