Merge branch 'master' into next
799034f2da04
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 10 2013, 15:05.

Description

Merge branch 'master' into next

master: BibField: new @persistent_identifier "decorator" OAIRepository: CFG_OAI_REPOSITORY_MARCXML_SIZE BibField: bug fixes when using decorators BibSched: parse_runtime_limit() tests fix BibFormat: QR-code format element

Committed

Tibor Simko <tibor.simko@cern.ch>

Jun 10 2013, 15:05

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:799034f2da04: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 10 2013, 15:05

Commit	Author	Details	Committed
01e39ac8dc43	Tibor Simko	Merge branch 'maint-1.1'	Jun 10 2013
662be5c1e0ee	Esteban J. G. Gabancho/Tibor Simko	BibField: new @persistent_identifier "decorator"	Jun 10 2013
60adbd26108a	Samuele Kaplun/Tibor Simko	OAIRepository: CFG_OAI_REPOSITORY_MARCXML_SIZE	Jun 10 2013
db48f45abf5e	Tibor Simko	Merge branch 'maint-1.1'	Jun 10 2013
d7b910557aa6	Esteban J. G. Gabancho/Tibor Simko	BibField: bug fixes when using decorators	Jun 10 2013
364cbba12420	Alessio Deiana/Tibor Simko	BibSched: parse_runtime_limit() tests fix	Jun 10 2013
03fb99dbecb0	Lars Holm Nielsen/Tibor Simko	BibFormat: QR-code format element	Jun 3 2013

				Path
	M			modules/bibfield/etc/atlantis.cfg
	M			modules/bibfield/etc/test_bibfield.cfg
	M			modules/bibfield/lib/bibfield_config_engine.py
	M			modules/bibfield/lib/bibfield_config_engine_unit_tests.py
	M			modules/bibfield/lib/bibfield_jsonreader.py
	M			modules/bibfield/lib/bibfield_regression_tests.py
	M			modules/bibfield/lib/bibfield_utils.py
	A			modules/bibfield/lib/functions/get_persistent_identifiers_keys.py
	M			modules/bibformat/lib/elements/Makefile.am
	A			modules/bibformat/lib/elements/bfe_qrcode.py
	M			modules/miscutil/lib/dateutils_unit_tests.py
	M			modules/oairepository/lib/oai_repository_config.py