Diffusion invenio-infoscience a240a50ce571

Merge branch 'master' into next
a240a50ce571
Actions

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

Description

Merge branch 'master' into next

master: BibField: initial release BibEncode: fix uuid Python 2.4 compatibility

Merge note: amended Bibrec model and requirements list.

Conflicts:
INSTALL
modules/miscutil/lib/inveniocfg.py

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

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Apr 26 2013, 13:47

Parents

R3600:1fccd1176372: BibField: initial release
R3600:38bac14cd4a9: WebMessage: fix menu and broken links

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:a240a50ce571: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Apr 26 2013, 13:47

Merged Changes

	Commit			Author	Details	Committed
	1fccd1176372			Esteban J. G. Gabancho/Tibor Simko	BibField: initial release	Apr 26 2013
	37db097b61f7			Lars Holm Nielsen/Tibor Simko	BibEncode: fix uuid Python 2.4 compatibility	Apr 18 2013

Changes (45)

		Path
M		INSTALL
M		config/invenio.conf
M		configure-tests.py
M		configure.ac
M		modules/Makefile.am
M		modules/bibedit/lib/bibedit_model.py
M		modules/bibencode/lib/bibencode_config.py
M		modules/bibencode/lib/bibencode_utils.py
A	(dir)	modules/bibfield/
P		modules/bibfield/Makefile.am Copied from modules/bibsort/doc/Makefile.am
A	(dir)	modules/bibfield/etc/
P		modules/bibfield/etc/Makefile.am Copied from modules/bibsort/etc/Makefile.am
A		modules/bibfield/etc/atlantis.cfg
A		modules/bibfield/etc/bibfield.cfg
A		modules/bibfield/etc/test_authors.cfg
A		modules/bibfield/etc/test_bibfield.cfg
A		modules/bibfield/etc/test_title.cfg
A	(dir)	modules/bibfield/lib/
P		modules/bibfield/lib/Makefile.am Copied from modules/bibsched/lib/Makefile.am
A		modules/bibfield/lib/bibfield.py
A		modules/bibfield/lib/bibfield_config_engine.py
A		modules/bibfield/lib/bibfield_config_engine_unit_tests.py
A		modules/bibfield/lib/bibfield_jsonreader.py
A		modules/bibfield/lib/bibfield_marcreader.py
A		modules/bibfield/lib/bibfield_marcreader_regression_tests.py
A		modules/bibfield/lib/bibfield_regression_tests.py
A		modules/bibfield/lib/bibfield_utils.py
A		modules/bibfield/lib/bibfield_utils_unit_tests.py
A	(dir)	modules/bibfield/lib/functions/
P		modules/bibfield/lib/functions/Makefile.am Copied from modules/bibsort/bin/Makefile.am
P		modules/bibfield/lib/functions/__init__.py Copied from modules/bibauthorid/lib/__init__.py
A		modules/bibfield/lib/functions/check_field_existence.py
A		modules/bibfield/lib/functions/check_field_type.py
P		modules/bibfield/lib/functions/get_doi.py Copied from modules/bibedit/doc/hacking/Makefile.am
P		modules/bibfield/lib/functions/get_number_of_copies.py Copied from modules/websubmit/lib/functions/Format_Record.py
A		modules/bibfield/lib/functions/is_type_isbn.py
A		modules/bibfield/lib/functions/is_type_isbn_issn_unit_tests.py
P		modules/bibfield/lib/functions/is_type_issn.py Copied from modules/miscutil/bin/inveniomanage.in
P		modules/bibfield/lib/functions/is_type_num.py Copied from modules/bibedit/doc/admin/Makefile.am
P		modules/bibfield/lib/functions/is_type_str.py Copied from modules/bibedit/doc/admin/Makefile.am
P		modules/bibfield/lib/functions/util_split.py Copied from modules/websubmit/lib/functions/Format_Record.py
M		modules/miscutil/lib/inveniocfg.py
P		modules/miscutil/lib/upgrades/invenio_2013_01_12_bibrec_master_format.py Copied from modules/miscutil/lib/upgrades/invenio_2012_11_07_xtrjob_last_recid.py
M		modules/miscutil/sql/tabcreate.sql
M		requirements.txt