Merge branch 'master' into next
4beeacbe2ccd
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Dec 18 2012, 15:13.

Description

Merge branch 'master' into next

master: testutils: new JavaScript unit test framework BibFormat: fixes last run date for HDREF

Conflicts:
config/invenio.conf

Committed

Tibor Simko <tibor.simko@cern.ch>

Dec 18 2012, 15:13

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:4beeacbe2ccd: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Dec 18 2012, 15:13

	Commit			Author	Details	Committed
	3e85affef150			Javier Martin Montull/Tibor Simko	testutils: new JavaScript unit test framework	Dec 17 2012
	6f613abeb076			Alessio Deiana/Tibor Simko	BibFormat: fixes last run date for HDREF	Dec 17 2012

				Path
	M			INSTALL
	M			Makefile.am
	M			config/invenio.conf
	M			modules/bibedit/lib/Makefile.am
	M			modules/bibedit/lib/bibedit_engine.js
	M			modules/bibedit/lib/bibedit_engine.py
	A			modules/bibedit/lib/bibedit_engine_unit_tests.conf
	A			modules/bibedit/lib/bibedit_engine_unit_tests.js
	M			modules/bibformat/lib/bibreformat.py
	M			modules/miscutil/lib/inveniocfg.py
	M			modules/miscutil/lib/testutils.py