[Pkg-owncloud-commits] [owncloud] 117/123: Merge pull request #16243 from owncloud/error_if_download_failed

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 7e271012b205af08e5f31ea8d6419fecb08c317e
Merge: 7ee3f99 887be70
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon May 18 11:42:55 2015 +0200

    Merge pull request #16243 from owncloud/error_if_download_failed
    
    redirect to error page if download failed

 apps/encryption/appinfo/application.php            |  3 +-
 apps/encryption/lib/crypto/encryption.php          | 40 ++++++++++
 apps/encryption/lib/util.php                       | 31 +++++++-
 apps/encryption/settings/settings-personal.php     |  3 +-
 apps/encryption/tests/lib/UtilTest.php             | 18 +++--
 apps/files_sharing/lib/sharedstorage.php           |  8 +-
 .../exceptions/decryptionfailedexception.php       | 11 +++
 lib/private/files.php                              | 88 ++++++++++++----------
 lib/private/files/storage/wrapper/encryption.php   | 24 ++++++
 .../exceptions/genericencryptionexception.php      | 11 ++-
 lib/public/encryption/iencryptionmodule.php        | 12 +++
 settings/changepassword/controller.php             |  3 +-
 tests/lib/files/storage/wrapper/encryption.php     |  9 ++-
 tests/lib/files/stream/encryption.php              |  3 +-
 14 files changed, 208 insertions(+), 56 deletions(-)

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