Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-31 | 12 | -4/+16 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-30 | 12 | -0/+12 |
| | |||||
* | Merge pull request #16578 from owncloud/fix_16556 | Thomas Müller | 2015-05-28 | 1 | -1/+1 |
|\ | | | | | show txt preview when file contains text | ||||
| * | show txt preview when file contains text | Georg Ehrke | 2015-05-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #16592 from owncloud/fix-16574 | Morris Jobke | 2015-05-28 | 1 | -0/+1 |
|\ \ | | | | | | | Add type hint for OC_Channel | ||||
| * | | Add type hint for OC_Channel | Victor Dubiniuk | 2015-05-27 | 1 | -0/+1 |
| |/ | |||||
* | | Only use quota stream wrapper on "files" | Vincent Petry | 2015-05-28 | 1 | -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_storages | Vincent Petry | 2015-05-28 | 3 | -29/+77 |
|\ \ | | | | | | | [encryption] fix move versions between storages | ||||
| * | | copy keys before we move a file between storages to make sure that the new ↵ | Bjoern Schiessle | 2015-05-22 | 2 | -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 Schiessle | 2015-05-21 | 1 | -6/+15 |
| | | | | | | | | | | | | between system wide mount points and user specific mountpoints | ||||
* | | | Merge pull request #16577 from owncloud/enc_improve_migration | Vincent Petry | 2015-05-28 | 1 | -55/+59 |
|\ \ \ | | | | | | | | | only request encryption module for files which are not excluded | ||||
| * | | | only request encryption module for files which are not excluded | Bjoern Schiessle | 2015-05-27 | 1 | -55/+59 |
| | |/ | |/| | |||||
* | | | Merge pull request #16591 from owncloud/enc_improved_error_message | Björn Schießle | 2015-05-28 | 4 | -26/+15 |
|\ \ \ | | | | | | | | | improved error message for various states | ||||
| * | | | improve error messages displayed to the user | Bjoern Schiessle | 2015-05-27 | 4 | -26/+15 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-28 | 8 | -0/+24 |
| | | | |||||
* | | | Fix indentation | Lukas Reschke | 2015-05-27 | 1 | -25/+25 |
|/ / | |||||
* | | Merge pull request #16527 from owncloud/end-processing-when-404 | Morris Jobke | 2015-05-27 | 1 | -0/+1 |
|\ \ | | | | | | | End processing when file is not found | ||||
| * | | End processing when file is not found | Lukas Reschke | 2015-05-22 | 1 | -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üller | 2015-05-26 | 1 | -5/+0 |
| | | | |||||
* | | | Revert "Revert "FIX for webdav.mediencenter.t-online.de"" | Oliver Kohl D.Sc | 2015-05-26 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #16561 from owncloud/add-default-timeout-back | Björn Schießle | 2015-05-26 | 1 | -1/+7 |
|\ \ \ | | | | | | | | | Add connection timeout to default POST options | ||||
| * | | | Add connection timeout to default POST options | Lukas Reschke | 2015-05-26 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16560 | ||||
* | | | | Merge pull request #16515 from owncloud/deprecate-useless-helper-class | Vincent Petry | 2015-05-26 | 2 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Deprecate useless helper class | ||||
| * | | | | Deprecate useless helper class | Lukas Reschke | 2015-05-21 | 2 | -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-auth | Vincent Petry | 2015-05-26 | 2 | -7/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | Disallow cookie auth for cors requests | ||||
| * | | | | | disallow cookie auth for cors requests | Bernhard Posselt | 2015-05-22 | 2 | -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_upload | Björn Schießle | 2015-05-26 | 1 | -9/+30 |
|\ \ \ \ \ | | | | | | | | | | | | | always write file, if fseek doesn't work we write the whole file | ||||
| * | | | | | flush() comments + perf opt | jknockaert | 2015-05-26 | 1 | -5/+7 |
| | | | | | | |||||
| * | | | | | fix calculation of $count, $count is always 8129 so we need to check this | jknockaert | 2015-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | against the unencrypted file size | ||||
| * | | | | | test to simulate a non-seekable stream wrapper | Bjoern Schiessle | 2015-05-21 | 1 | -6/+18 |
| | | | | | | |||||
| * | | | | | encrypted filesize calculation in flush() | jknockaert | 2015-05-21 | 1 | -1/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #16339 from owncloud/master-override-channel | Thomas Müller | 2015-05-26 | 2 | -2/+33 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow change update channel via public API | ||||
| * | | | | | | Allow change update channel via public API | Victor Dubiniuk | 2015-05-13 | 2 | -2/+33 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-25 | 4 | -4/+8 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-24 | 4 | -0/+18 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-23 | 8 | -0/+26 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload | Vincent Petry | 2015-05-22 | 1 | -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 Schiessle | 2015-05-22 | 1 | -1/+2 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | if possible, otherwise stuff like versioning will break | ||||
* | | | | | | Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype | Vincent Petry | 2015-05-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Get correct mimetype when moving and changing extension | ||||
| * | | | | | | Get correct mimetype when moving and changing extension | Vincent Petry | 2015-05-21 | 1 | -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-trait | Joas Schilling | 2015-05-22 | 5 | -4/+16 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix PHPDoc | ||||
| * | | | | | | | Fix PHPDoc | Lukas Reschke | 2015-05-22 | 5 | -4/+16 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | Use correct parameters | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-22 | 14 | -0/+28 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #16499 from owncloud/fix-phpdoc-annotations | Lukas Reschke | 2015-05-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Fix PHPDoc :see_no_evil: | ||||
| * | | | | | Fix PHPDoc :see_no_evil: | Lukas Reschke | 2015-05-21 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | *sigh* | ||||
* | | | | | Merge pull request #16473 from owncloud/occ_16221 | Joas Schilling | 2015-05-21 | 1 | -4/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | occ option to update all third party apps without disable | ||||
| * | | | | | Skip disable3rdParty Apps | Steffen Lindner | 2015-05-20 | 1 | -4/+19 |
| | |/ / / | |/| | | | |||||
* / | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-21 | 70 | -94/+8 |
|/ / / / | |||||
* | | | | Merge pull request #16322 from owncloud/trash-view | Morris Jobke | 2015-05-20 | 2 | -3/+20 |
|\ \ \ \ | | | | | | | | | | | dont go trough the view when moving to trash | ||||
| * | | | | use copy when doing a crossStorageCopy on the same storage | Robin Appelman | 2015-05-19 | 2 | -3/+20 |
| | | | | |