[Pkg-owncloud-commits] [owncloud] 84/215: Merge pull request #15681 from owncloud/issue/15667-occ-encryption

[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 6a7b7caa810421593ec6725977f08f2d5138eacd
Merge: 802f818 e4c24a6
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Apr 27 13:28:59 2015 +0200

    Merge pull request #15681 from owncloud/issue/15667-occ-encryption
    
    OCC commands to manage encryption

 apps/encryption_dummy/appinfo/app.php              |   4 +-
 core/command/encryption/disable.php                |  56 ++++++++
 core/command/encryption/enable.php                 |  58 +++++++++
 core/command/encryption/listmodules.php            |  80 ++++++++++++
 core/command/encryption/setdefaultmodule.php       |  68 ++++++++++
 core/register_command.php                          |   4 +
 lib/private/encryption/manager.php                 |  27 ++--
 lib/private/encryption/update.php                  |   2 +-
 lib/private/files/storage/wrapper/encryption.php   |   6 +-
 lib/public/encryption/imanager.php                 |  19 ++-
 settings/admin.php                                 |   8 +-
 tests/core/command/encryption/disabletest.php      |  85 ++++++++++++
 tests/core/command/encryption/enabletest.php       |  97 ++++++++++++++
 .../command/encryption/setdefaultmoduletest.php    |  92 +++++++++++++
 tests/lib/encryption/managertest.php               | 142 +++++++++++++++------
 tests/lib/encryption/updatetest.php                |   2 +-
 tests/lib/files/storage/wrapper/encryption.php     |   5 +-
 17 files changed, 672 insertions(+), 83 deletions(-)

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