Merge branch 'master' into next
f1a839ee7017
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 20 2013, 15:12.

Description

Merge branch 'master' into next

master: WebSearch: advanced search notification if no hits BibCirculation: ILL improvement BibFormat: checks for bibformat bin BibFormat: fixes unit tests

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 20 2013, 15:12

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:f1a839ee7017: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 20 2013, 15:12

Commit	Author	Details	Committed
5d50657e4926	Tibor Simko	Merge branch 'maint-1.1'	Feb 20 2013
94d55b911221	Ludmila Marian/Tibor Simko	WebSearch: advanced search notification if no hits	Feb 20 2013
264537fddded	Raja Sripada/Tibor Simko	BibCirculation: ILL improvement	Feb 20 2013
00a07b6945d6	Alessio Deiana/Tibor Simko	BibFormat: checks for bibformat bin	Feb 20 2013
de7e13cc7d27	Alessio Deiana/Tibor Simko	BibFormat: fixes unit tests	Feb 20 2013

				Path
	M			modules/bibcirculation/lib/bibcirculation_dblayer.py
	M			modules/bibcirculation/lib/bibcirculationadminlib.py
	M			modules/bibformat/lib/bibformat_engine.py
	M			modules/bibformat/lib/bibformat_engine_unit_tests.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_regression_tests.py