summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-2422-14/+252
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-2326-2/+64
* Merge pull request #16536 from rullzer/unit_tests_16511Bernhard Posselt2015-05-221-0/+80
|\
| * Unit tests for #16511Roeland Jago Douma2015-05-221-0/+80
* | Merge pull request #16526 from owncloud/enc_fix_versions_webdav_uploadVincent Petry2015-05-223-2/+25
|\ \ | |/ |/|
| * remove part file extension before we read a filekey to reuse a existing key i...Bjoern Schiessle2015-05-223-2/+25
* | Merge pull request #16493 from owncloud/cache-movewithcorrectmimetypeVincent Petry2015-05-222-8/+20
|\ \
| * | Get correct mimetype when moving and changing extensionVincent Petry2015-05-212-8/+20
* | | Merge pull request #16516 from owncloud/fix-phpdoc-traitJoas Schilling2015-05-225-4/+16
|\ \ \
| * | | Fix PHPDocLukas Reschke2015-05-225-4/+16
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2232-0/+82
| |_|/ |/| |
* | | Merge pull request #16499 from owncloud/fix-phpdoc-annotationsLukas Reschke2015-05-211-1/+1
|\ \ \
| * | | Fix PHPDoc :see_no_evil:Lukas Reschke2015-05-211-1/+1
| |/ /
* | | Merge pull request #16473 from owncloud/occ_16221Joas Schilling2015-05-212-6/+31
|\ \ \
| * | | Skip disable3rdParty AppsSteffen Lindner2015-05-202-6/+31
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-21136-98/+160
* | | Merge pull request #16469 from oparoz/restore-minheight-for-single-public-pre...Vincent Petry2015-05-201-0/+1
|\ \ \ | |/ / |/| |
| * | Restore min-height for single previewsOlivier Paroz2015-05-201-0/+1
* | | Merge pull request #16322 from owncloud/trash-viewMorris Jobke2015-05-205-31/+125
|\ \ \
| * | | add tests for copyFromStorage with same storageRobin Appelman2015-05-191-12/+25
| * | | cleanup move/copy logic in trashRobin Appelman2015-05-191-20/+57
| * | | use copy when doing a crossStorageCopy on the same storageRobin Appelman2015-05-192-3/+20
| * | | adjust testRobin Appelman2015-05-181-1/+7
| * | | fix target path for moveRobin Appelman2015-05-181-2/+6
| * | | update cache after move to trashRobin Appelman2015-05-181-0/+2
| * | | dont go trough the view when moving to trashRobin Appelman2015-05-181-12/+27
* | | | Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdav...Morris Jobke2015-05-201-4/+5
|\ \ \ \
| * | | | Return 401 when accessing public webdav and s2s is disabledVincent Petry2015-05-201-4/+5
* | | | | Merge pull request #16075 from owncloud/skeleton-copy-delayVincent Petry2015-05-2013-75/+98
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Catch NotFoundException and return no quota information which simply reflects...Thomas Müller2015-05-191-10/+26
| * | | | exception class will be logged as well - helps especially in cases where the ...Thomas Müller2015-05-191-3/+9
| * | | | Fix provisioning API unit tests for loginVincent Petry2015-05-183-49/+51
| * | | | fix testsRobin Appelman2015-05-183-5/+3
| * | | | fix testsRobin Appelman2015-05-181-1/+3
| * | | | fix testsRobin Appelman2015-05-183-4/+3
| * | | | 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-202-2/+326
|\ \ \ \ \
| * | | | | Add support for disallowing domains to the ContentSecurityPolicyLukas Reschke2015-05-202-2/+326
* | | | | | Merge pull request #16326 from owncloud/fix-16192Morris Jobke2015-05-202-3/+29
|\ \ \ \ \ \
| * | | | | | include base dn test in functionality testArthur Schiwon2015-05-132-3/+29
* | | | | | | Merge pull request #16444 from owncloud/close-new-dropdownJan-Christoph Borchardt2015-05-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Closes "New" dropdown when switching categoryMorris Jobke2015-05-191-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #16453 from cmeh/patch-6Morris Jobke2015-05-201-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Clean-up of orthography, grammarChristian Hoffmann2015-05-191-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #16446 from owncloud/fix-url-generationLukas Reschke2015-05-203-2/+115
|\ \ \ \ \ \
| * | | | | | Added unit tests for download URL in public sharing pageVincent Petry2015-05-193-1/+114
| * | | | | | Fix URL generationLukas Reschke2015-05-191-1/+1
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-20126-42/+128
* | | | | | Merge pull request #16440 from owncloud/scrutinizer-patch-1Thomas Müller2015-05-1920-42/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Re-add use statementMorris Jobke2015-05-191-0/+1