[Pkg-owncloud-commits] [owncloud] 135/223: Merge pull request #8618 from owncloud/yet-another-ajax-lost-password

[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 db9ac135743ed0a5620a1f3a69249bf96607d91c
Merge: 4a26219 dda5e6c
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Sat Jun 14 12:01:13 2014 +0200

    Merge pull request #8618 from owncloud/yet-another-ajax-lost-password
    
    Basic ajax lost password

 core/js/lostpassword.js                         | 138 ++++++++++++++++
 core/lostpassword/application.php               |  44 ++++++
 core/lostpassword/controller.php                | 111 -------------
 core/lostpassword/controller/lostcontroller.php | 199 ++++++++++++++++++++++++
 core/lostpassword/css/resetpassword.css         |   7 +
 core/lostpassword/encrypteddataexception.php    |  14 ++
 core/lostpassword/templates/lostpassword.php    |  47 ++----
 core/lostpassword/templates/resetpassword.php   |  22 ++-
 core/routes.php                                 |  22 ++-
 core/templates/login.php                        |   6 +-
 10 files changed, 440 insertions(+), 170 deletions(-)

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