[stable 9] Add mimetype to OCS Share API output #23060

Merged
merged 2 commits into from Mar 11, 2016

Projects

None yet

3 participants

@rullzer
Contributor
rullzer commented Mar 9, 2016

Backport of #23056
Approval in: #23056 (comment)

CC: @LukasReschke @nickvergessen @PVince81 @MorrisJobke

@rullzer rullzer Add mimetype to OCS Share API output
Fixes #23044
48cdf38
@rullzer rullzer added this to the 9.0.1-current-maintenance milestone Mar 9, 2016
@MorrisJobke
Member

๐Ÿ‘

@DeepDiver1975
Member

@rullzer please add the integration test here as well - THX

@rullzer @DeepDiver1975 rullzer Add intergration tests
67c4759
@DeepDiver1975
Member

@rullzer please add the integration test here as well - THX

just did it myself ๐Ÿ˜‰

@rullzer
Contributor
rullzer commented Mar 10, 2016

Thanks :)

@MorrisJobke
Member

@DeepDiver1975 Good to merge?

@rullzer
Contributor
rullzer commented Mar 11, 2016

@MorrisJobke if you provide the missing thumbs up ;)

@MorrisJobke
Member

@MorrisJobke if you provide the missing thumbs up ;)

The first one is already mine, but I could place a second one here ;)

Take it: ๐Ÿ‘

@rullzer
Contributor
rullzer commented Mar 11, 2016

The first one is already mine, but I could place a second one here ;)

I might need new glasses ๐Ÿ˜•

@DeepDiver1975 DeepDiver1975 merged commit e3de44e into stable9 Mar 11, 2016

21 checks passed

cla-bot-core Build #2157 succeeded in 17 sec
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #59262 succeeded in 11 min
Details
core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #53215 succeeded in 40 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #27893 succeeded in 1 hr 14 min
Details
core-ci-linux/database=oci,label=SLAVE Build #27893 succeeded in 1 hr 48 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #27893 succeeded in 50 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #27893 succeeded in 32 min
Details
ocs-api-integration-tests-ci Build #8302 succeeded in 12 min
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #8128 succeeded in 11 min
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #8128 succeeded in 15 min
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #8128 succeeded in 19 min
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #8521 succeeded in 2 min 23 sec
Details
server-master-linux-php5.4-ci/database=sqlite,label=SLAVE Build #582 succeeded in 13 min
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #36037 succeeded in 7 min 50 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #12512 succeeded in 7 min 39 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #12512 succeeded in 21 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #12512 succeeded in 37 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #12512 succeeded in 14 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #12512 succeeded in 35 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #12512 succeeded in 19 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #12512 succeeded in 17 min
Details
@DeepDiver1975 DeepDiver1975 deleted the stable9_backport_23056 branch Mar 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment