Merge branch 'master' into next
6cbb6d467612
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 14 2013, 17:36.

Description

Merge branch 'master' into next

master: BibUpload: indicators in strong tags WebSubmit: new websubmitadmin CLI WebSearch: fix infinite synonym lookup cases

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 14 2013, 17:36

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:6cbb6d467612: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 14 2013, 17:36

Commit	Author	Details	Committed
506f064d5272	Tibor Simko	Merge branch 'maint-1.1'	Aug 14 2013
98fd2bdbb340	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Aug 14 2013
6999ab19979b	Samuele Kaplun/Tibor Simko	BibUpload: indicators in strong tags	Aug 14 2013
4aa95f373b53	Jerome Caffaro/Tibor Simko	WebSubmit: new websubmitadmin CLI	Aug 14 2013
ed6d4d54d29c	Jerome Caffaro/Tibor Simko	WebSearch: fix infinite synonym lookup cases	Aug 14 2013

				Path
	M			configure.ac
	M			modules/bibupload/lib/bibupload.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websubmit/bin/Makefile.am
	P			modules/websubmit/bin/websubmitadmin.in Copied from modules/miscutil/bin/inveniocfg.in
	M			modules/websubmit/doc/admin/websubmit-admin-guide.webdoc
	M			modules/websubmit/lib/Makefile.am
	M			modules/websubmit/lib/websubmitadmin_regression_tests.py
	A			modules/websubmit/lib/websubmitadmincli.py