[stable 9] Allow blocking of group sharing #23473

Merged
merged 5 commits into from Mar 22, 2016

Projects

None yet

4 participants

@rullzer
Contributor
rullzer commented Mar 22, 2016

Backport of #23398
Approval in #23398 (comment)

Intergration tests are unfortunatly not backportable. Or at least not easily.

CC: @PVince81 @nickvergessen

rullzer added some commits Mar 18, 2016
@rullzer rullzer Add `allow sharing with groups` checkbox to admin page 4d8c81a
@rullzer rullzer Add config to sharemanager e9fc791
@rullzer rullzer Block group sharing in API and in share manager
* Fix tests
aa75cfc
@rullzer rullzer Respect disabled group sharing in sharee endpoint
* Fix tests
c7f1b82
@rullzer rullzer Fix js strings if group sharing is disabled
f8f292a
@rullzer rullzer added this to the 9.0.1-current-maintenance milestone Mar 22, 2016
@nickvergessen
Contributor

👍

@PVince81
Collaborator

👍

@DeepDiver1975 DeepDiver1975 merged commit 1a100c6 into stable9 Mar 22, 2016

20 of 22 checks passed

core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #53742 failed in 1 min 59 sec
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #8515 failed in 1 min 9 sec
Details
cla-bot-core Build #2523 succeeded in 6 min 52 sec
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #59802 succeeded in 2 min 19 sec
Details
core-ci-linux/database=mysql,label=SLAVE Build #28351 succeeded in 29 min
Details
core-ci-linux/database=oci,label=SLAVE Build #28351 succeeded in 48 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #28351 succeeded in 28 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #28351 succeeded in 23 min
Details
ocs-api-integration-tests-ci Build #8721 succeeded in 6 min 51 sec
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #8515 succeeded in 1 min 29 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #8515 succeeded in 3 min 17 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #9119 succeeded in 3 min 30 sec
Details
server-master-linux-php5.4-ci/database=sqlite,label=SLAVE Build #1142 succeeded in 4 min 22 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #36594 succeeded in 3 min 40 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #12883 succeeded in 8 min 15 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #12883 succeeded in 52 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #12883 succeeded in 49 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #12883 succeeded in 25 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #12883 succeeded in 46 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #12883 succeeded in 15 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #12883 succeeded in 12 min
Details
@DeepDiver1975 DeepDiver1975 deleted the stable9_23398 branch Mar 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment