[Pkg-owncloud-commits] [owncloud] 93/172: Merge pull request #8398 from owncloud/enc_backup_keys

[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 b8de1e5d716c416beae328506e368cd0554509e1
Merge: e934129 a9ac117
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Tue May 13 09:25:16 2014 -0400

    Merge pull request #8398 from owncloud/enc_backup_keys
    
    backup the encryption key after the encryption was disabled

 apps/files_encryption/lib/util.php   |  4 +--
 apps/files_encryption/tests/util.php | 11 +++++++
 lib/private/util.php                 | 36 ++++++++++++++++-----
 settings/ajax/deletekeys.php         | 17 ++++++++++
 settings/ajax/restorekeys.php        | 24 ++++++++++++++
 settings/js/personal.js              | 61 ++++++++++++++++++++++++++++++------
 settings/personal.php                |  6 +++-
 settings/routes.php                  |  4 +++
 settings/templates/personal.php      | 35 +++++++++++++++++++--
 9 files changed, 176 insertions(+), 22 deletions(-)


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