[Pkg-owncloud-commits] [owncloud] 162/457: Merge pull request #16591 from owncloud/enc_improved_error_message

[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 e1483f65c3cd800f90e962764b06bf2379ca4432
Merge: 1726d84 68db305
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Thu May 28 10:55:53 2015 +0200

    Merge pull request #16591 from owncloud/enc_improved_error_message
    
    improved error message for various states

 apps/encryption/appinfo/app.php                    |  6 +-
 apps/encryption/appinfo/application.php            |  8 +-
 apps/encryption/controller/statuscontroller.php    | 15 +++-
 apps/encryption/js/encryption.js                   |  2 +-
 apps/encryption/lib/crypto/encryption.php          |  2 +-
 apps/encryption/lib/session.php                    |  1 +
 .../tests/controller/StatusControllerTest.php      | 90 ++++++++++++++++++++++
 .../exceptions/decryptionfailedexception.php       | 11 ---
 lib/private/encryption/manager.php                 | 11 ++-
 lib/private/server.php                             |  2 +-
 .../exceptions/genericencryptionexception.php      | 17 ++--
 tests/lib/encryption/managertest.php               |  6 +-
 12 files changed, 136 insertions(+), 35 deletions(-)

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