Commit message (Expand) | 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 | 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 | Victor Dubiniuk | 2015-05-27 | 1 | -0/+1 |
| |/ | |||||
* | | Only use quota stream wrapper on "files" | Vincent Petry | 2015-05-28 | 1 | -3/+5 |
* | | Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages | Vincent Petry | 2015-05-28 | 3 | -29/+77 |
|\ \ | |||||
| * | | copy keys before we move a file between storages to make sure that the new ta... | Bjoern Schiessle | 2015-05-22 | 2 | -23/+62 |
| * | | distinguish between source and target mount point to allow copy/rename betwee... | Bjoern Schiessle | 2015-05-21 | 1 | -6/+15 |
* | | | 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 | 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 |
|\ \ \ | |||||
| * | | | 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 | Lukas Reschke | 2015-05-22 | 1 | -0/+1 |
* | | | 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 | Lukas Reschke | 2015-05-26 | 1 | -1/+7 |
* | | | | Merge pull request #16515 from owncloud/deprecate-useless-helper-class | Vincent Petry | 2015-05-26 | 2 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Deprecate useless helper class | Lukas Reschke | 2015-05-21 | 2 | -1/+5 |
* | | | | | Merge pull request #16532 from owncloud/cors-no-cookie-auth | Vincent Petry | 2015-05-26 | 2 | -7/+47 |
|\ \ \ \ \ | |||||
| * | | | | | disallow cookie auth for cors requests | Bernhard Posselt | 2015-05-22 | 2 | -7/+47 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #16452 from owncloud/enc_ftp_upload | Björn Schießle | 2015-05-26 | 1 | -9/+30 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
| * | | | | | 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 | 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 to reuse a existing key i... | Bjoern Schiessle | 2015-05-22 | 1 | -1/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype | Vincent Petry | 2015-05-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Get correct mimetype when moving and changing extension | Vincent Petry | 2015-05-21 | 1 | -1/+1 |
* | | | | | | | Merge pull request #16516 from owncloud/fix-phpdoc-trait | Joas Schilling | 2015-05-22 | 5 | -4/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix PHPDoc | Lukas Reschke | 2015-05-22 | 5 | -4/+16 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | [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: | Lukas Reschke | 2015-05-21 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #16473 from owncloud/occ_16221 | Joas Schilling | 2015-05-21 | 1 | -4/+19 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ | |||||
| * | | | | use copy when doing a crossStorageCopy on the same storage | Robin Appelman | 2015-05-19 | 2 | -3/+20 |