Merge branch 'master' into next
93530a853d87
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 8 2013, 16:03.

Description

Merge branch 'master' into next

master: WebAccess: new CERN auth method support WebSearch: webcoll performance improvements BibCirculation: CERN LDAP improvements WebSearch: permitted restricted colls for guests WebSession: login_method changes

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 8 2013, 16:03

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:93530a853d87: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 8 2013, 16:03

Commit	Author	Details	Committed
dc773dadf2e4	Tibor Simko	Merge branch 'maint-1.1'	Feb 8 2013
664497c14955	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Feb 8 2013
6d3f354cdf3e	Samuele Kaplun/Tibor Simko	WebAccess: new CERN auth method support	Feb 8 2013
7b177509fedc	Samuele Kaplun/Tibor Simko	WebSearch: webcoll performance improvements	Feb 8 2013
b4378e09aa39	Samuele Kaplun/Tibor Simko	BibCirculation: CERN LDAP improvements	Feb 8 2013
b9b7e761602d	Samuele Kaplun/Tibor Simko	WebSearch: permitted restricted colls for guests	Feb 8 2013
1ef1e4451534	Samuele Kaplun/Tibor Simko	WebSession: login_method changes	Feb 8 2013

				Path
	M			modules/bibcirculation/lib/bibcirculation.py
	M			modules/bibcirculation/lib/bibcirculation_cern_ldap.py
	M			modules/bibcirculation/lib/bibcirculation_daemon.py
	M			modules/bibcirculation/lib/bibcirculation_utils.py
	M			modules/webaccess/lib/external_authentication_sso.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_webcoll.py
	M			modules/websession/lib/webuser.py