[Pkg-owncloud-commits] [owncloud-client] 324/470: Merge pull request #4673 from ckamm/shareperm

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 48e594ebbfc5f3ca2105f7d33ffe5fd0e2225d5e
Merge: 8155c1c 910c61b
Author: ckamm <mail at ckamm.de>
Date:   Thu Apr 14 09:44:58 2016 +0200

    Merge pull request #4673 from ckamm/shareperm
    
    Disable unavailable sharing permissions #4383

 src/gui/ocssharejob.cpp          |   2 +-
 src/gui/ocssharejob.h            |   2 +-
 src/gui/owncloudgui.cpp          |  19 +++++--
 src/gui/share.cpp                |  14 ++---
 src/gui/share.h                  |  17 ++----
 src/gui/sharedialog.cpp          | 112 ++++++++++++++++++++++++++-------------
 src/gui/sharedialog.h            |  15 ++++--
 src/gui/sharelinkwidget.cpp      |   6 +--
 src/gui/sharelinkwidget.h        |   5 +-
 src/gui/sharepermissions.h       |  37 +++++++++++++
 src/gui/shareusergroupwidget.cpp |  57 ++++++++++++--------
 src/gui/shareusergroupwidget.h   |  10 ++--
 12 files changed, 201 insertions(+), 95 deletions(-)

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