[Pkg-owncloud-commits] [owncloud] 103/145: Merge pull request #7225 from owncloud/enc_improved_error_handling_oc6

[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 80dcec773abd0bd87f0a1afc1f42b6f8df5b1923
Merge: eb8b221 43738da
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon Feb 17 11:26:21 2014 +0100

    Merge pull request #7225 from owncloud/enc_improved_error_handling_oc6
    
    [encryption] improved error handling (OC6)

 apps/files_encryption/ajax/getMigrationStatus.php |  8 +-
 apps/files_encryption/appinfo/app.php             |  1 +
 apps/files_encryption/hooks/hooks.php             | 29 +++++---
 apps/files_encryption/js/detect-migration.js      |  6 +-
 apps/files_encryption/js/encryption.js            | 12 +++
 apps/files_encryption/lib/util.php                | 91 +++++++++++++++--------
 apps/files_encryption/tests/util.php              | 81 +++++++++++++++++++-
 settings/ajax/decryptall.php                      |  9 ++-
 8 files changed, 184 insertions(+), 53 deletions(-)

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