[Pkg-owncloud-commits] [owncloud] 40/205: Merge pull request #16889 from owncloud/group-sorting-fixes

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 6adddb3095abc447c30fb3f8c46c26507895c660
Merge: a5eb2f0 497fe93
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Fri Jun 19 08:29:25 2015 +0200

    Merge pull request #16889 from owncloud/group-sorting-fixes
    
    Only sort by group name when LDAP is involved

 lib/private/group/manager.php                      | 18 ++++
 lib/public/igroupmanager.php                       |  9 ++
 settings/controller/groupscontroller.php           | 10 ++-
 settings/js/users/groups.js                        | 45 +++++++++-
 settings/templates/users/part.grouplist.php        |  2 +-
 settings/users.php                                 | 14 +++-
 tests/settings/controller/groupscontrollertest.php | 96 +++++++++++++++++++++-
 7 files changed, 183 insertions(+), 11 deletions(-)

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