Merge branch 'maint-1.0' into maint-1.1
98fd2bdbb340
Actions

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

Description

Merge branch 'maint-1.0' into maint-1.1

maint-1.0: BibUpload: indicators in strong tags WebSubmit: new websubmitadmin CLI

Conflicts:
configure.ac
modules/websubmit/bin/Makefile.am
modules/websubmit/doc/admin/websubmit-admin-guide.webdoc
modules/websubmit/lib/Makefile.am

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 14 2013, 17:27

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:98fd2bdbb340: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 14 2013, 17:27

	Commit			Author	Details	Committed
	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

				Path
	M			configure.ac
	M			modules/bibupload/lib/bibupload.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