Merge branch 'master' into next
891f5840d767
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Apr 4 2013, 15:47.

Description

Merge branch 'master' into next

master: WebSession: unit vs regression test suite cleanup BibSched: parse_runtime_limit() fix OAIHarvest: holding-pen UI bugfixes

Conflicts:
modules/websession/lib/Makefile.am

Committed

Tibor Simko <tibor.simko@cern.ch>

Apr 4 2013, 15:47

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:891f5840d767: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Apr 4 2013, 15:47

Commit	Author	Details	Committed
de2dfe333b95	Tibor Simko	Merge branch 'maint-1.1'	Apr 4 2013
c64c7dd995db	Samuele Kaplun/Tibor Simko	WebSession: unit vs regression test suite cleanup	Apr 3 2013
1ec423effdb2	Alessio Deiana/Tibor Simko	BibSched: parse_runtime_limit() fix	Apr 3 2013
2b8d4b2b0beb	Wojciech Ziolek/Tibor Simko	OAIHarvest: holding-pen UI bugfixes	Mar 18 2013

				Path
	M			modules/bibsched/lib/bibtask.py
	M			modules/miscutil/lib/dateutils.py
	M			modules/miscutil/lib/dateutils_unit_tests.py
	M			modules/miscutil/lib/errorlib.py
	M			modules/oaiharvest/lib/oai_harvest_admin.py
	M			modules/oaiharvest/lib/oai_harvest_dblayer.py
	M			modules/oaiharvest/lib/oai_harvest_templates.py
	M			modules/oaiharvest/web/admin/oai_harvest_admin.js
	M			modules/oaiharvest/web/admin/oaiharvestadmin.py
	M			modules/websession/lib/Makefile.am
	M			modules/websession/lib/webuser_regression_tests.py
	P			modules/websession/lib/webuser_unit_tests.py Copied from modules/miscutil/lib/jsonutils_unit_tests.py
	M			modules/webstyle/css/invenio.css