[Pkg-owncloud-commits] [owncloud] 156/172: Merge pull request #8604 from owncloud/sharing_encforce_password

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit b52cb8f5570f4ec0e73aa5b2e1a5dbd178135382
Merge: d5f60a8 b6e14af
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Fri May 16 12:23:01 2014 -0400

    Merge pull request #8604 from owncloud/sharing_encforce_password
    
    allow admin to enforce passwords for public link shares

 apps/files_sharing/lib/api.php   | 19 ++++++++------
 apps/files_sharing/tests/api.php | 54 ++++++++++++++++++++++++++++++++++++++++
 core/js/config.php               |  1 +
 core/js/share.js                 | 52 ++++++++++++++++++++++++--------------
 lib/private/share/share.php      | 11 +++++++-
 lib/private/util.php             | 10 ++++++++
 lib/public/util.php              |  8 ++++++
 settings/admin.php               |  1 +
 settings/templates/admin.php     |  5 ++--
 9 files changed, 132 insertions(+), 29 deletions(-)

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