Diffusion invenio-infoscience c51deedda280

Merge branch 'jmartinm/cataloguing-improvements'
c51deedda280
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 22 2013, 13:36.

Description

Merge branch 'jmartinm/cataloguing-improvements'

jmartinm/cataloguing-improvements: BibEdit: improvements and fixes BibEdit: css changes BibEdit: allow opening deleted records Inveniogc: delete BibEdit temporary files BibEdit: delete cache if record not modified BibEdit: add extraction of references from URL BibEdit: several fixes BibEdit: introduce textmarc editor BibEditMulti: multiple improvements and fixes BibEdit: cnum generation on conference records BibEdit: multiple improvements BatchUploader: multiple improvements

Merge note: tested functionality, fixed small kwalitee issues, renamed unit test file.

Conflicts:
modules/bibupload/lib/batchuploader_engine.py
modules/bibupload/lib/batchuploader_templates.py
modules/bibupload/lib/batchuploader_webinterface.py
modules/miscutil/lib/urlutils.py

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

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Jan 22 2013, 15:03

Parents

R3600:fd9209f8a759: BibEdit: improvements and fixes
R3600:4206e12a612e: Merge branch 'maint-1.1'

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:c51deedda280: Merge branch 'jmartinm/cataloguing-improvements' (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 22 2013, 15:03

Merged Changes

Commit	Author	Details	Committed
fd9209f8a759	Javier Martin Montull	BibEdit: improvements and fixes	Dec 20 2012
9bc27a33a463	Javier Martin Montull	BibEdit: css changes	Dec 20 2012
275ed4165e55	Javier Martin Montull	BibEdit: allow opening deleted records	Dec 20 2012
ee92fecfd6b0	Javier Martin Montull	Inveniogc: delete BibEdit temporary files	Dec 20 2012
f89239cacf03	Javier Martin Montull	BibEdit: delete cache if record not modified	Dec 20 2012
d64f25819deb	Javier Martin Montull	BibEdit: add extraction of references from URL	Dec 20 2012
3a471e8b953b	Javier Martin Montull	BibEdit: several fixes	Dec 20 2012
47ea5216da9a	Javier Martin Montull	BibEdit: introduce textmarc editor	Dec 20 2012
8aa7059bd860	Sebastian Witowski/Javier Martin Montull	BibEditMulti: multiple improvements and fixes	Dec 20 2012
8c279216ba4f	Javier Martin Montull	BibEdit: cnum generation on conference records	Dec 20 2012
5909fe52019a	Javier Martin/Javier Martin Montull	BibEdit: multiple improvements	Dec 20 2012
56940c9ef638	Javier Martin/Javier Martin Montull	BatchUploader: multiple improvements	Dec 20 2012

Changes (36)

				Path
	M			modules/bibedit/etc/Makefile.am
	M			modules/bibedit/lib/Makefile.am
	A			modules/bibedit/lib/bibedit.css
	M			modules/bibedit/lib/bibedit_config.py
	M			modules/bibedit/lib/bibedit_display.js
	M			modules/bibedit/lib/bibedit_engine.js
	M			modules/bibedit/lib/bibedit_engine.py
	M			modules/bibedit/lib/bibedit_keys.js
	M			modules/bibedit/lib/bibedit_menu.js
	A			modules/bibedit/lib/bibedit_refextract.js
	M			modules/bibedit/lib/bibedit_templates.py
	A			modules/bibedit/lib/bibedit_unit_tests.py
	M			modules/bibedit/lib/bibedit_utils.py
	M			modules/bibedit/lib/bibedit_web_tests.py
	M			modules/bibedit/lib/bibedit_webinterface.py
	M			modules/bibedit/lib/bibeditmulti.js
	M			modules/bibedit/lib/bibeditmulti_engine.py
	M			modules/bibedit/lib/bibeditmulti_templates.py
	M			modules/bibedit/lib/bibeditmulti_webinterface.py
	M			modules/bibrecord/lib/bibrecord.py
	M			modules/bibrecord/lib/textmarc2xmlmarc.py
	M			modules/bibrecord/lib/xmlmarc2textmarc.py
	M			modules/bibupload/lib/Makefile.am
	A			modules/bibupload/lib/batchuploader.js
	M			modules/bibupload/lib/batchuploader_engine.py
	M			modules/bibupload/lib/batchuploader_templates.py
	M			modules/bibupload/lib/batchuploader_webinterface.py
	M			modules/miscutil/lib/sequtils_cnum.py
	M			modules/miscutil/lib/urlutils.py
	M			modules/websession/lib/inveniogc.py
	M			modules/webstyle/img/Makefile.am
	A			modules/webstyle/img/bibedit_extract_url.png
	A			modules/webstyle/img/bibedit_tableview.png
	A			modules/webstyle/img/bibedit_textmarc.png
	A			modules/webstyle/img/edit-paste.png
	A			modules/webstyle/img/ref_extract.png