[Pkg-owncloud-commits] [owncloud] 155/165: Merge pull request #15799 from owncloud/fix-enc-folder-move

[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 750f0bc4896dcc35695e535ae826da353d265daf
Merge: 42d9ba0 0042bdd
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Apr 22 16:04:29 2015 +0200

    Merge pull request #15799 from owncloud/fix-enc-folder-move
    
    Fix enc folder move

 apps/encryption/appinfo/application.php          |  18 +--
 apps/encryption/lib/keymanager.php               |  54 +++++----
 apps/encryption/settings/settings-personal.php   |   2 +-
 apps/encryption_dummy/lib/dummymodule.php        |   4 +-
 lib/private/encryption/keys/factory.php          |  50 --------
 lib/private/encryption/keys/storage.php          | 143 ++++++++---------------
 lib/private/encryption/manager.php               |   3 +-
 lib/private/files/storage/wrapper/encryption.php |  30 ++---
 lib/private/server.php                           |  25 ++--
 lib/public/encryption/keys/istorage.php          |  33 ++++--
 lib/public/iservercontainer.php                  |   4 +-
 settings/changepassword/controller.php           |   2 +-
 tests/lib/encryption/keys/storage.php            |  27 +++--
 tests/lib/files/storage/wrapper/encryption.php   |  40 +++----
 14 files changed, 168 insertions(+), 267 deletions(-)

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