summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-3112-4/+16
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-3012-0/+12
|
* Merge pull request #16578 from owncloud/fix_16556Thomas Müller2015-05-281-1/+1
|\ | | | | show txt preview when file contains text
| * show txt preview when file contains textGeorg Ehrke2015-05-271-1/+1
| |
* | Merge pull request #16592 from owncloud/fix-16574Morris Jobke2015-05-281-0/+1
|\ \ | | | | | | Add type hint for OC_Channel
| * | Add type hint for OC_ChannelVictor Dubiniuk2015-05-271-0/+1
| |/
* | Only use quota stream wrapper on "files"Vincent Petry2015-05-281-3/+5
| | | | | | | | | | Prevent using the quota stream wrapper on trashbin folders and other metadata folders
* | Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storagesVincent Petry2015-05-283-29/+77
|\ \ | | | | | | [encryption] fix move versions between storages
| * | copy keys before we move a file between storages to make sure that the new ↵Bjoern Schiessle2015-05-222-23/+62
| | | | | | | | | | | | target file reuses the old file key, otherwise versions will break
| * | distinguish between source and target mount point to allow copy/rename ↵Bjoern Schiessle2015-05-211-6/+15
| | | | | | | | | | | | between system wide mount points and user specific mountpoints
* | | Merge pull request #16577 from owncloud/enc_improve_migrationVincent Petry2015-05-281-55/+59
|\ \ \ | | | | | | | | only request encryption module for files which are not excluded
| * | | only request encryption module for files which are not excludedBjoern Schiessle2015-05-271-55/+59
| | |/ | |/|
* | | Merge pull request #16591 from owncloud/enc_improved_error_messageBjörn Schießle2015-05-284-26/+15
|\ \ \ | | | | | | | | improved error message for various states
| * | | improve error messages displayed to the userBjoern Schiessle2015-05-274-26/+15
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-288-0/+24
| | |
* | | Fix indentationLukas Reschke2015-05-271-25/+25
|/ /
* | Merge pull request #16527 from owncloud/end-processing-when-404Morris Jobke2015-05-271-0/+1
|\ \ | | | | | | End processing when file is not found
| * | End processing when file is not foundLukas Reschke2015-05-221-0/+1
| | | | | | | | | | | | | | | | | | We have to end the processing when a file is not found or otherwise the method is proceeding and even sending invalid file paths to the sendfile methods. Due to nginx preventing directory traversals this is luckily not immediately exploitable. We should for hardening purposes however quit the script execution just as we do for 403 cases and others as well.
* | | Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de"""Thomas Müller2015-05-261-5/+0
| | |
* | | Revert "Revert "FIX for webdav.mediencenter.t-online.de""Oliver Kohl D.Sc2015-05-261-0/+5
| | |
* | | Merge pull request #16561 from owncloud/add-default-timeout-backBjörn Schießle2015-05-261-1/+7
|\ \ \ | | | | | | | | Add connection timeout to default POST options
| * | | Add connection timeout to default POST optionsLukas Reschke2015-05-261-1/+7
| | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16560
* | | | Merge pull request #16515 from owncloud/deprecate-useless-helper-classVincent Petry2015-05-262-1/+5
|\ \ \ \ | | | | | | | | | | Deprecate useless helper class
| * | | | Deprecate useless helper classLukas Reschke2015-05-212-1/+5
| | | | | | | | | | | | | | | | | | | | The helper class has no real reason anymore with 8.1.0 as we now have better public APIs. No need for an `IHelper` class like that from my opinion.
* | | | | Merge pull request #16532 from owncloud/cors-no-cookie-authVincent Petry2015-05-262-7/+47
|\ \ \ \ \ | | | | | | | | | | | | Disallow cookie auth for cors requests
| * | | | | disallow cookie auth for cors requestsBernhard Posselt2015-05-222-7/+47
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing ... fixes fix test add php doc fix small mistake add another phpdoc remove not working cors annotations from files app
* | | | | Merge pull request #16452 from owncloud/enc_ftp_uploadBjörn Schießle2015-05-261-9/+30
|\ \ \ \ \ | | | | | | | | | | | | always write file, if fseek doesn't work we write the whole file
| * | | | | flush() comments + perf optjknockaert2015-05-261-5/+7
| | | | | |
| * | | | | fix calculation of $count, $count is always 8129 so we need to check thisjknockaert2015-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | against the unencrypted file size
| * | | | | test to simulate a non-seekable stream wrapperBjoern Schiessle2015-05-211-6/+18
| | | | | |
| * | | | | encrypted filesize calculation in flush()jknockaert2015-05-211-1/+8
| | | | | |
* | | | | | Merge pull request #16339 from owncloud/master-override-channelThomas Müller2015-05-262-2/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow change update channel via public API
| * | | | | | Allow change update channel via public APIVictor Dubiniuk2015-05-132-2/+33
| | | | | | |
* | | | | | | [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
| | | | |