[sagenb] 60/179: Merge pull request #73 from rmartinjak/ldap

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit f3e6e20ed6cf16001fdb4fab4e17a16dffdaad52
Merge: bacc6a5 c2da6b7
Author: P Purkayastha <ppurka at gmail.com>
Date:   Sat Mar 9 23:59:04 2013 -0800

    Merge pull request #73 from rmartinjak/ldap
    
    Introduce LDAP Authentication into the notebook.

 .../data/sage/html/settings/account_settings.html  |   2 +-
 .../data/sage/html/settings/user_management.html   |  14 +-
 sagenb/notebook/auth.py                            | 146 +++++++++++++++++++++
 sagenb/notebook/conf.py                            |  11 ++
 sagenb/notebook/server_conf.py                     |  59 +++++++++
 sagenb/notebook/user.py                            |   9 +-
 sagenb/notebook/user_manager.py                    |  75 ++++++++++-
 7 files changed, 302 insertions(+), 14 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git