[Pkg-owncloud-commits] [owncloud] 80/104: Merge pull request #6612 from owncloud/user-no-change-displayname-stable

[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 c6ca9be4063855557621c992adfc40c4e408b487
Merge: 7dddf59 a8fd55d
Author: icewind1991 <robin at icewind.nl>
Date:   Tue Jan 14 07:13:21 2014 -0800

    Merge pull request #6612 from owncloud/user-no-change-displayname-stable
    
    Backport: Re-add the config options to remove the ability for users to change their displayname

 lib/private/allconfig.php     |  24 +++++---
 lib/private/server.php        |  12 +++-
 lib/private/user/database.php | 124 +++++++++++++++++++++---------------------
 lib/private/user/manager.php  |  17 ++++--
 lib/private/user/user.php     |  50 +++++++++++++----
 lib/public/iconfig.php        |  15 ++++-
 tests/lib/user/user.php       |   5 +-
 7 files changed, 156 insertions(+), 91 deletions(-)


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