[Pkg-owncloud-commits] [owncloud] 111/165: Merge pull request #15637 from owncloud/migrate-certificate-stuff

[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 3959f8ac4e979f9c1fcaef3d18deb0c7c858f560
Merge: e9d6807 9bc4845
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Apr 20 13:56:35 2015 +0200

    Merge pull request #15637 from owncloud/migrate-certificate-stuff
    
    Migrate personal certificate handling to AppFramework controllers

 apps/files_external/appinfo/routes.php             |   6 -
 lib/private/security/certificate.php               |  20 +--
 lib/private/security/certificatemanager.php        |   4 +-
 lib/public/icertificatemanager.php                 |   3 +-
 settings/ajax/addRootCertificate.php               |  52 ------
 settings/ajax/removeRootCertificate.php            |  28 ----
 settings/application.php                           |  12 ++
 settings/controller/certificatecontroller.php      |  93 +++++++++++
 settings/js/personal.js                            |  22 +--
 settings/personal.php                              |   2 +
 settings/routes.php                                |   6 +-
 settings/templates/personal.php                    |   3 +-
 tests/lib/security/certificate.php                 |  42 +++--
 tests/lib/security/certificatemanager.php          |  24 ++-
 .../controller/CertificateControllerTest.php       | 174 +++++++++++++++++++++
 15 files changed, 359 insertions(+), 132 deletions(-)

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