[Pkg-owncloud-commits] [owncloud] 173/258: Merge pull request #11363 from owncloud/sharing_group_shares_stable7
David Prévot
taffit at moszumanska.debian.org
Sat Oct 11 17:22:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit d388ef5c0aa55e1bdd972daa731f9a74556154ea
Merge: 7d389b2 9254073
Author: Björn Schießle <bjoern at schiessle.org>
Date: Wed Oct 1 23:35:33 2014 +0200
Merge pull request #11363 from owncloud/sharing_group_shares_stable7
Sharing group shares stable7
apps/files_sharing/appinfo/app.php | 3 +
apps/files_sharing/lib/exceptions.php | 32 ++
apps/files_sharing/lib/share/file.php | 9 +-
apps/files_sharing/lib/sharedmount.php | 21 +-
apps/files_sharing/lib/sharedstorage.php | 17 +
apps/files_sharing/tests/base.php | 12 +
apps/files_sharing/tests/share.php | 160 ++++++--
apps/files_sharing/tests/sharedmount.php | 37 ++
lib/private/share/helper.php | 127 ++-----
lib/private/share/hooks.php | 28 +-
lib/private/share/share.php | 601 +++++++++++++++++--------------
lib/public/share.php | 4 +-
tests/lib/share/backend.php | 23 +-
tests/lib/share/share.php | 96 ++++-
14 files changed, 741 insertions(+), 429 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list