Diffusion invenio-infoscience a11eb4b031a4

Merge branch 'master' into next
a11eb4b031a4
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 12 2013, 16:48.

Description

Merge branch 'master' into next

master: BibAuthorID: UI and backend improvements BibAuthorID: improvements and fixes BibAuthorID: improvements, fixes and optimizations BibUpload: check DOI uniqueness WebLinkback: safer notification email WebLinkback: clean regression test suite WebStyle: inactivate two regression tests DocExtract: nose-friendly refextract tests

Conflicts:
modules/bibauthorid/lib/bibauthorid_templates.py
modules/bibauthorid/lib/bibauthorid_webinterface.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 12 2013, 16:48

Parents

R3600:476040d1b854: Merge branch 'maint-1.1'
R3600:58006d1c8776: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:a11eb4b031a4: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 12 2013, 16:48

Merged Changes

Commit	Author	Details	Committed
476040d1b854	Tibor Simko	Merge branch 'maint-1.1'	Feb 12 2013
bb1c60406421	Samuele Carli/Tibor Simko	BibAuthorID: UI and backend improvements	Feb 12 2013
9fec8dcb6c5e	Samuele Carli/Tibor Simko	BibAuthorID: improvements and fixes	Feb 12 2013
bf328e50aa23	Samuele Carli/Tibor Simko	BibAuthorID: improvements, fixes and optimizations	Feb 12 2013
fc4e5a42e321	Jerome Caffaro/Tibor Simko	BibUpload: check DOI uniqueness	Feb 12 2013
931653d2b916	Patrick Glauner/Tibor Simko	WebLinkback: safer notification email	Feb 12 2013
e59b1ab0622e	Patrick Glauner/Tibor Simko	WebLinkback: clean regression test suite	Feb 11 2013
d29010ef76a8	Tibor Simko	WebStyle: inactivate two regression tests	Feb 11 2013
85ab04fa4607	Tibor Simko	DocExtract: nose-friendly refextract tests	Feb 11 2013

Changes (31)

				Path
	M			modules/bibauthorid/lib/bibauthorid.js
	M			modules/bibauthorid/lib/bibauthorid_cluster_set.py
	M			modules/bibauthorid/lib/bibauthorid_comparison.py
	M			modules/bibauthorid/lib/bibauthorid_config.py
	M			modules/bibauthorid/lib/bibauthorid_daemon.py
	M			modules/bibauthorid/lib/bibauthorid_dbinterface.py
	M			modules/bibauthorid/lib/bibauthorid_frontinterface.py
	M			modules/bibauthorid/lib/bibauthorid_general_utils.py
	M			modules/bibauthorid/lib/bibauthorid_name_utils.py
	M			modules/bibauthorid/lib/bibauthorid_personid_maintenance.py
	M			modules/bibauthorid/lib/bibauthorid_prob_matrix.py
	M			modules/bibauthorid/lib/bibauthorid_rabbit.py
	M			modules/bibauthorid/lib/bibauthorid_templates.py
	M			modules/bibauthorid/lib/bibauthorid_tortoise.py
	M			modules/bibauthorid/lib/bibauthorid_webapi.py
	M			modules/bibauthorid/lib/bibauthorid_webauthorprofileinterface.py
	M			modules/bibauthorid/lib/bibauthorid_webinterface.py
	M			modules/bibauthorid/lib/bibauthorid_wedge.py
	M			modules/bibrecord/lib/bibrecord.py
	M			modules/bibrecord/lib/bibrecord_unit_tests.py
	M			modules/bibupload/lib/bibupload.py
	M			modules/bibupload/lib/bibupload_regression_tests.py
	M			modules/docextract/lib/refextract_regression_tests.py
	M			modules/webauthorprofile/lib/webauthorprofile.js
	M			modules/webauthorprofile/lib/webauthorprofile_daemon.py
	M			modules/webauthorprofile/lib/webauthorprofile_dbapi.py
	M			modules/webauthorprofile/lib/webauthorprofile_webinterface.py
	M			modules/weblinkback/lib/weblinkback.py
	M			modules/weblinkback/lib/weblinkback_config.py
	M			modules/weblinkback/lib/weblinkback_regression_tests.py
	M			modules/webstyle/lib/webstyle_regression_tests.py