Merge branch 'master' into next
0e29422aadba
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on May 17 2011, 19:08.

Description

Merge branch 'master' into next

Committed

Tibor Simko <tibor.simko@cern.ch>

May 17 2011, 19:08

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:0e29422aadba: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).May 17 2011, 19:08

Commit	Author	Details	Committed
9471cc9b68e2	Tibor Simko	Merge branch 'tmp-jmartin'	May 17 2011
9ee54c912055	Javier Martin/Tibor Simko	BibEditMulti: remove onkeypress() calls	May 17 2011
74b5607c6852	Javier Martin/Tibor Simko	BibEditMulti: add condition when deleting a field	May 17 2011
1015897bbd93	Javier Martin/Tibor Simko	BibEditMulti: allow modification of field actions	May 17 2011
c9349d4d4ef0	Javier Martin/Tibor Simko	BibEditMulti: rephrase explanation of actions to be performed	May 17 2011
695eb68bbe23	Jerome Caffaro/Tibor Simko	WebSubmit: display status of already approved docs	May 17 2011
0bb815dcc329	Samuele Kaplun/Tibor Simko	bibdocfile: new compose_file function	May 17 2011
4a220ae02c4a	Jan Aage Lavik/Tibor Simko	BibMatch: match specific collections	May 17 2011
70396ca934e6	Samuele Kaplun/Tibor Simko	BibUpload: refresh BibRecDocs after expunge	May 16 2011

				Path
	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/bibmatch/doc/admin/bibmatch-admin-guide.webdoc
	M			modules/bibmatch/lib/bibmatch_engine.py
	M			modules/bibmatch/lib/bibmatch_regression_tests.py
	M			modules/bibupload/lib/bibupload.py
	M			modules/miscutil/lib/invenio_connector.py
	M			modules/websubmit/lib/bibdocfile.py
	M			modules/websubmit/lib/bibdocfile_regression_tests.py
	M			modules/websubmit/lib/websubmit_templates.py
	M			modules/websubmit/web/publiline.py