[Pkg-owncloud-commits] [owncloud] 124/165: Merge pull request #15677 from owncloud/enc_reset_private_key_password

[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 b78e76a1cb68ffb374044851e9f96a0c7f463862
Merge: a130888 04674c0
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Apr 20 20:48:12 2015 +0200

    Merge pull request #15677 from owncloud/enc_reset_private_key_password
    
    [encryption] let user update the private key password

 apps/encryption/appinfo/application.php            |  14 ++
 apps/encryption/appinfo/routes.php                 |   5 +
 apps/encryption/controller/settingscontroller.php  | 131 ++++++++++++
 apps/encryption/js/settings-personal.js            |  17 +-
 .../tests/controller/SettingsControllerTest.php    | 222 +++++++++++++++++++++
 5 files changed, 379 insertions(+), 10 deletions(-)


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