Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-24 | 22 | -14/+252 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-23 | 26 | -2/+64 |
* | Merge pull request #16536 from rullzer/unit_tests_16511 | Bernhard Posselt | 2015-05-22 | 1 | -0/+80 |
|\ | |||||
| * | Unit tests for #16511 | Roeland Jago Douma | 2015-05-22 | 1 | -0/+80 |
* | | Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload | Vincent Petry | 2015-05-22 | 3 | -2/+25 |
|\ \ | |/ |/| | |||||
| * | remove part file extension before we read a filekey to reuse a existing key i... | Bjoern Schiessle | 2015-05-22 | 3 | -2/+25 |
* | | Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype | Vincent Petry | 2015-05-22 | 2 | -8/+20 |
|\ \ | |||||
| * | | Get correct mimetype when moving and changing extension | Vincent Petry | 2015-05-21 | 2 | -8/+20 |
* | | | 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 | 32 | -0/+82 |
| |_|/ |/| | | |||||
* | | | 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 | 2 | -6/+31 |
|\ \ \ | |||||
| * | | | Skip disable3rdParty Apps | Steffen Lindner | 2015-05-20 | 2 | -6/+31 |
| | |/ | |/| | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-21 | 136 | -98/+160 |
* | | | Merge pull request #16469 from oparoz/restore-minheight-for-single-public-pre... | Vincent Petry | 2015-05-20 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Restore min-height for single previews | Olivier Paroz | 2015-05-20 | 1 | -0/+1 |
* | | | Merge pull request #16322 from owncloud/trash-view | Morris Jobke | 2015-05-20 | 5 | -31/+125 |
|\ \ \ | |||||
| * | | | add tests for copyFromStorage with same storage | Robin Appelman | 2015-05-19 | 1 | -12/+25 |
| * | | | cleanup move/copy logic in trash | Robin Appelman | 2015-05-19 | 1 | -20/+57 |
| * | | | use copy when doing a crossStorageCopy on the same storage | Robin Appelman | 2015-05-19 | 2 | -3/+20 |
| * | | | adjust test | Robin Appelman | 2015-05-18 | 1 | -1/+7 |
| * | | | fix target path for move | Robin Appelman | 2015-05-18 | 1 | -2/+6 |
| * | | | update cache after move to trash | Robin Appelman | 2015-05-18 | 1 | -0/+2 |
| * | | | dont go trough the view when moving to trash | Robin Appelman | 2015-05-18 | 1 | -12/+27 |
* | | | | Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdav... | Morris Jobke | 2015-05-20 | 1 | -4/+5 |
|\ \ \ \ | |||||
| * | | | | Return 401 when accessing public webdav and s2s is disabled | Vincent Petry | 2015-05-20 | 1 | -4/+5 |
* | | | | | Merge pull request #16075 from owncloud/skeleton-copy-delay | Vincent Petry | 2015-05-20 | 13 | -75/+98 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Catch NotFoundException and return no quota information which simply reflects... | Thomas Müller | 2015-05-19 | 1 | -10/+26 |
| * | | | | exception class will be logged as well - helps especially in cases where the ... | Thomas Müller | 2015-05-19 | 1 | -3/+9 |
| * | | | | Fix provisioning API unit tests for login | Vincent Petry | 2015-05-18 | 3 | -49/+51 |
| * | | | | fix tests | Robin Appelman | 2015-05-18 | 3 | -5/+3 |
| * | | | | fix tests | Robin Appelman | 2015-05-18 | 1 | -1/+3 |
| * | | | | fix tests | Robin Appelman | 2015-05-18 | 3 | -4/+3 |
| * | | | | wait with copying the skeleton untill login and setupfs are done | Robin Appelman | 2015-05-18 | 2 | -4/+4 |
* | | | | | Merge pull request #16463 from owncloud/add-support-to-disallow-domains | Jan-Christoph Borchardt | 2015-05-20 | 2 | -2/+326 |
|\ \ \ \ \ | |||||
| * | | | | | Add support for disallowing domains to the ContentSecurityPolicy | Lukas Reschke | 2015-05-20 | 2 | -2/+326 |
* | | | | | | Merge pull request #16326 from owncloud/fix-16192 | Morris Jobke | 2015-05-20 | 2 | -3/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | include base dn test in functionality test | Arthur Schiwon | 2015-05-13 | 2 | -3/+29 |
* | | | | | | | Merge pull request #16444 from owncloud/close-new-dropdown | Jan-Christoph Borchardt | 2015-05-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Closes "New" dropdown when switching category | Morris Jobke | 2015-05-19 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #16453 from cmeh/patch-6 | Morris Jobke | 2015-05-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Clean-up of orthography, grammar | Christian Hoffmann | 2015-05-19 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #16446 from owncloud/fix-url-generation | Lukas Reschke | 2015-05-20 | 3 | -2/+115 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added unit tests for download URL in public sharing page | Vincent Petry | 2015-05-19 | 3 | -1/+114 |
| * | | | | | | Fix URL generation | Lukas Reschke | 2015-05-19 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-20 | 126 | -42/+128 |
* | | | | | | Merge pull request #16440 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-05-19 | 20 | -42/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Re-add use statement | Morris Jobke | 2015-05-19 | 1 | -0/+1 |