[Pkg-owncloud-commits] [owncloud] 25/34: Merge pull request #11560 from owncloud/stable6-encsharekeymatchingdirectbackport

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.6
in repository owncloud.

commit 65b439da8cbc12e6c056e3e62e3fe47eab7b1bf2
Merge: 870dc98 d63bba3
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Fri Oct 17 11:36:03 2014 +0200

    Merge pull request #11560 from owncloud/stable6-encsharekeymatchingdirectbackport
    
    [stable6] backport share key pattern matching fix

 apps/files_encryption/hooks/hooks.php      |  10 ++-
 apps/files_encryption/lib/helper.php       |  46 ++++++++-----
 apps/files_encryption/lib/keymanager.php   |  55 ++++++++-------
 apps/files_encryption/tests/helper.php     |  56 +++++++++++++++
 apps/files_encryption/tests/hooks.php      | 105 ++++++++++++++++++++---------
 apps/files_encryption/tests/keymanager.php |  64 ++++++++++++++----
 apps/files_encryption/tests/share.php      |  56 +++++++++++++++
 apps/files_encryption/tests/trashbin.php   |  91 ++++++++++++++++++++-----
 apps/files_encryption/tests/util.php       |  16 +++--
 apps/files_trashbin/lib/trashbin.php       |   6 +-
 10 files changed, 391 insertions(+), 114 deletions(-)

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