[Pkg-owncloud-commits] [owncloud-client] 270/484: Merge pull request #4055 from owncloud/user_group_sharing

[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 914a942e33638977091d37b35780852b51e7ae0e
Merge: 5e482ad 6431a2a
Author: Roeland Douma <rullzer at users.noreply.github.com>
Date:   Fri Nov 6 09:35:42 2015 +0100

    Merge pull request #4055 from owncloud/user_group_sharing
    
    User group sharing

 src/gui/CMakeLists.txt                           |   7 +
 src/gui/ocsshareejob.cpp                         |  46 ++
 src/gui/ocsshareejob.h                           |  58 +++
 src/gui/ocssharejob.cpp                          |  36 +-
 src/gui/ocssharejob.h                            |  26 +-
 src/gui/share.cpp                                |  70 ++-
 src/gui/share.h                                  |  37 +-
 src/gui/sharedialog.cpp                          | 521 ++---------------------
 src/gui/sharedialog.h                            |  76 +---
 src/gui/sharedialog.ui                           | 216 +---------
 src/gui/sharee.cpp                               | 180 ++++++++
 src/gui/sharee.h                                 |  88 ++++
 src/gui/{sharedialog.cpp => sharelinkwidget.cpp} | 144 ++-----
 src/gui/{sharedialog.h => sharelinkwidget.h}     |  25 +-
 src/gui/{sharedialog.ui => sharelinkwidget.ui}   | 113 +----
 src/gui/shareusergroupwidget.cpp                 | 241 +++++++++++
 src/gui/shareusergroupwidget.h                   | 115 +++++
 src/gui/shareusergroupwidget.ui                  |  65 +++
 src/gui/sharewidget.ui                           |  77 ++++
 src/gui/socketapi.h                              |   1 +
 20 files changed, 1162 insertions(+), 980 deletions(-)


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