[Pkg-owncloud-commits] [owncloud] 125/153: Merge pull request #8599 from owncloud/sharing_disable_for_groups

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 050df76830f05e25df0c298988658c9482fb4b87
Merge: c4f6a80 12338e0
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Thu May 22 08:19:27 2014 -0400

    Merge pull request #8599 from owncloud/sharing_disable_for_groups
    
    allow admin to disable sharing for specific groups of users

 apps/files/css/files.css                 |  4 ++
 apps/files_sharing/js/share.js           | 32 ++++++++++----
 apps/files_sharing/lib/permissions.php   | 14 ++++---
 apps/files_sharing/lib/sharedstorage.php |  8 ++++
 apps/files_sharing/tests/api.php         | 72 ++++++++++++++++++++++++++++++++
 apps/files_sharing/tests/base.php        |  2 +
 apps/files_sharing/tests/proxy.php       |  4 +-
 core/js/config.php                       |  1 +
 lib/private/files/cache/permissions.php  | 19 +++++++--
 lib/private/files/storage/common.php     |  4 ++
 lib/private/share/share.php              | 10 ++++-
 lib/private/util.php                     | 23 ++++++++++
 lib/public/util.php                      |  9 ++++
 settings/admin.php                       | 18 ++++++++
 settings/ajax/excludegroups.php          | 18 ++++++++
 settings/css/settings.css                |  9 ++++
 settings/js/admin.js                     | 49 ++++++++++++++++++++++
 settings/routes.php                      |  2 +
 settings/templates/admin.php             | 22 ++++++++--
 tests/lib/util.php                       | 55 ++++++++++++++++++++++++
 20 files changed, 352 insertions(+), 23 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git