Merge branch 'maint-1.1'
5d50657e4926
Actions

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

Description

Merge branch 'maint-1.1'

maint-1.1: WebSearch: advanced search notification if no hits BibFormat: checks for bibformat bin BibFormat: fixes unit tests

Conflicts:
modules/websearch/lib/search_engine.py

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:5d50657e4926: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 20 2013, 15:12

Commit	Author	Details	Committed
94d55b911221	Ludmila Marian/Tibor Simko	WebSearch: advanced search notification if no hits	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/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