[Pkg-owncloud-commits] [owncloud] 36/122: Merge pull request #15752 from owncloud/feature/fix-encryption-return-values

[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 0f7b8dd33814a036b98727a7a9d82deaae061785
Merge: 7376ea9 8c08567
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon May 4 11:44:15 2015 +0200

    Merge pull request #15752 from owncloud/feature/fix-encryption-return-values
    
    [enc2] fixing return values and adding tests

 apps/encryption/controller/recoverycontroller.php  | 100 +++++++-----
 apps/encryption/js/settings-admin.js               |  65 ++++----
 apps/encryption/js/settings-personal.js            |  48 +++---
 .../tests/controller/RecoveryControllerTest.php    | 179 +++++++++++++++++++++
 4 files changed, 299 insertions(+), 93 deletions(-)

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