[Pkg-owncloud-commits] [owncloud-client] 214/484: Merge pull request #4033 from owncloud/share_object

[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 d38b19031771b1301eeedb56900a0eecb2c8baa3
Merge: 29558cb c7b8143
Author: Roeland Douma <rullzer at users.noreply.github.com>
Date:   Fri Oct 30 11:01:03 2015 +0100

    Merge pull request #4033 from owncloud/share_object
    
    Add share manager and the share objects

 src/gui/CMakeLists.txt  |   1 +
 src/gui/ocsjob.cpp      |  10 +-
 src/gui/ocsjob.h        |  11 +-
 src/gui/ocssharejob.cpp |  21 ++-
 src/gui/ocssharejob.h   |  48 +++----
 src/gui/share.cpp       | 265 +++++++++++++++++++++++++++++++++++
 src/gui/share.h         | 248 +++++++++++++++++++++++++++++++++
 src/gui/sharedialog.cpp | 364 ++++++++++++++----------------------------------
 src/gui/sharedialog.h   |  25 ++--
 9 files changed, 691 insertions(+), 302 deletions(-)

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