Diffusion invenio-infoscience 1808b7f2dd1d

Merge branch 'master' into next
1808b7f2dd1d
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 23 2012, 11:08.

Description

Merge branch 'master' into next

master: WebSubmit: configurable Document File Manager BibAuthorID: new major release BatchUploader: use localhost in robotupload tests BibSched: scheduling improvements BibSched: try harder to keep bibupload order BibSched: same-name concurrent task fix bibdocfile: bibdocfsinfo update fix BibAuthorID: adds aidUSERINPUTLOG userid column WebSession: enforce external user identifiers global: uniformize user-agent header usage BatchUploader: more RESTful interface WebApiKey: initial release urlutils: MS Office redirection workaround BibSched: adjust runtimes when using sequence-id

Conflicts:
modules/bibcirculation/lib/bibcirculation_utils.py
modules/bibcirculation/lib/bibcirculationadminlib.py
modules/miscutil/lib/urlutils.py
modules/miscutil/sql/tabcreate.sql
modules/miscutil/sql/tabdrop.sql
modules/webaccess/lib/access_control_config.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 23 2012, 11:25

Parents

R3600:a3c6b1a324b1: Merge branch 'maint-1.0'
R3600:4ae38799e1cb: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:1808b7f2dd1d: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 23 2012, 11:25

Merged Changes

Commit	Author	Details	Committed
a3c6b1a324b1	Tibor Simko	Merge branch 'maint-1.0'	Aug 23 2012
47e4a3364a9c	Samuele Kaplun/Tibor Simko	WebSubmit: configurable Document File Manager	Aug 23 2012
35945b13d1dd	Nikola Yolov/Tibor Simko	BibAuthorID: new major release	Aug 22 2012
ad29cb38d03d	Samuele Kaplun/Tibor Simko	BatchUploader: use localhost in robotupload tests	Aug 21 2012
62841fd10d64	Alessio Deiana/Tibor Simko	BibSched: scheduling improvements	Aug 21 2012
f8bafd9c6e0f	Alessio Deiana/Tibor Simko	BibSched: try harder to keep bibupload order	Aug 21 2012
46d111fbf9c6	Alessio Deiana/Tibor Simko	BibSched: same-name concurrent task fix	Aug 21 2012
5386bfbb60f0	Samuele Kaplun/Tibor Simko	bibdocfile: bibdocfsinfo update fix	Aug 21 2012
ca1a1a28d641	Samuele Carli/Tibor Simko	BibAuthorID: adds aidUSERINPUTLOG userid column	Aug 20 2012
bb52827c8bad	Samuele Kaplun/Tibor Simko	WebSession: enforce external user identifiers	Aug 20 2012
a88be6f2b061	Samuele Kaplun/Tibor Simko	global: uniformize user-agent header usage	Aug 20 2012
c83c3db1d03c	Samuele Kaplun/Tibor Simko	BatchUploader: more RESTful interface	Aug 20 2012
771fcecf352a	Esteban J. G. Gabancho/Tibor Simko	WebApiKey: initial release	Aug 20 2012
8080ade696df	Tibor Simko	Merge branch 'maint-1.0'	Aug 17 2012
49f69d35b34d	Samuele Kaplun/Tibor Simko	urlutils: MS Office redirection workaround	Aug 17 2012
96ebe3058e8d	Samuele Kaplun/Tibor Simko	BibSched: adjust runtimes when using sequence-id	Aug 17 2012

Changes (79)

				Path
	M			config/invenio.conf
	M			modules/bibauthorid/etc/name_authority_files/male_firstnames.txt
	M			modules/bibauthorid/lib/bibauthorid_backinterface.py
	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_general_utils.py
	M			modules/bibauthorid/lib/bibauthorid_least_squares.py
	M			modules/bibauthorid/lib/bibauthorid_merge.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_recipes.py
	M			modules/bibauthorid/lib/bibauthorid_scheduler.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_wedge.py
	M			modules/bibcirculation/lib/bibcirculation_utils.py
	M			modules/bibcirculation/lib/bibcirculationadminlib.py
	M			modules/bibclassify/lib/bibclassify_engine.py
	M			modules/bibclassify/lib/bibclassify_ontology_reader.py
	M			modules/bibclassify/lib/bibclassify_text_extractor.py
	M			modules/bibencode/lib/bibencode_tester.py
	M			modules/bibformat/lib/elements/bfe_issn.py
	M			modules/bibrank/lib/bibrankgkb.py
	M			modules/bibsched/lib/bibsched.py
	M			modules/bibsched/lib/bibtask.py
	M			modules/bibsword/lib/bibsword_client_http.py
	M			modules/bibsword/lib/bibsword_config.py
	M			modules/bibupload/doc/admin/bibupload-admin-guide.webdoc
	M			modules/bibupload/lib/Makefile.am
	M			modules/bibupload/lib/batchuploader_engine.py
	A			modules/bibupload/lib/batchuploader_regression_tests.py
	M			modules/bibupload/lib/batchuploader_webinterface.py
	M			modules/bibupload/lib/bibupload.py
	M			modules/bibupload/lib/bibupload_regression_tests.py
	M			modules/miscutil/lib/Makefile.am
	M			modules/miscutil/lib/invenio_connector.py
	M			modules/miscutil/lib/inveniocfg.py
	M			modules/miscutil/lib/plotextractor_getter.py
	M			modules/miscutil/lib/solrutils.py
	M			modules/miscutil/lib/urlutils.py
	A			modules/miscutil/lib/web_api_key.py
	A			modules/miscutil/lib/web_api_key_tests.py
	M			modules/miscutil/sql/tabbibclean.sql
	M			modules/miscutil/sql/tabcreate.sql
	M			modules/miscutil/sql/tabdrop.sql
	M			modules/webaccess/doc/admin/webaccess-admin-guide.webdoc
	M			modules/webaccess/lib/access_control_config.py
	M			modules/webaccess/lib/external_authentication.py
	M			modules/webaccess/lib/external_authentication_cern.py
	M			modules/webaccess/lib/external_authentication_ldap.py
	M			modules/webaccess/lib/external_authentication_robot.py
	M			modules/webaccess/lib/external_authentication_sso.py
	M			modules/webaccess/lib/webaccess_regression_tests.py
	M			modules/webaccess/lib/webaccessadmin_lib.py
	M			modules/webaccess/web/admin/webaccessadmin.py
	M			modules/webjournal/lib/webjournal_utils.py
	M			modules/webjournal/lib/webjournaladminlib.py
	M			modules/webjournal/lib/widgets/bfe_webjournal_widget_seminars.py
	M			modules/webjournal/lib/widgets/bfe_webjournal_widget_weather.py
	M			modules/websearch/lib/websearch_external_collections_getter.py
	M			modules/websession/lib/Makefile.am
	M			modules/websession/lib/webaccount.py
	M			modules/websession/lib/websession_templates.py
	M			modules/websession/lib/websession_webinterface.py
	M			modules/websession/lib/webuser.py
	A			modules/websession/lib/webuser_config.py
	M			modules/webstat/etc/webstat.cfg
	M			modules/webstyle/lib/webinterface_handler.py
	M			modules/webstyle/lib/webinterface_handler_wsgi_utils.py
	M			modules/websubmit/lib/bibdocfile.py
	M			modules/websubmit/lib/bibdocfile_regression_tests.py
	M			modules/websubmit/lib/websubmit_config.py
	M			modules/websubmit/lib/websubmit_webinterface.py

Merge branch 'master' into next1808b7f2dd1dActions

Description

Details

Event Timeline

Merged Changes

Changes (79)

R3600:1808b7f2dd1d

config/invenio.conf

modules/bibauthorid/etc/name_authority_files/male_firstnames.txt

modules/bibauthorid/lib/bibauthorid_backinterface.py

modules/bibauthorid/lib/bibauthorid_cluster_set.py

modules/bibauthorid/lib/bibauthorid_comparison.py

modules/bibauthorid/lib/bibauthorid_config.py

modules/bibauthorid/lib/bibauthorid_daemon.py

modules/bibauthorid/lib/bibauthorid_dbinterface.py

modules/bibauthorid/lib/bibauthorid_general_utils.py

modules/bibauthorid/lib/bibauthorid_least_squares.py

modules/bibauthorid/lib/bibauthorid_merge.py

modules/bibauthorid/lib/bibauthorid_name_utils.py

modules/bibauthorid/lib/bibauthorid_personid_maintenance.py

modules/bibauthorid/lib/bibauthorid_prob_matrix.py

modules/bibauthorid/lib/bibauthorid_rabbit.py

modules/bibauthorid/lib/bibauthorid_recipes.py

modules/bibauthorid/lib/bibauthorid_scheduler.py

modules/bibauthorid/lib/bibauthorid_templates.py

modules/bibauthorid/lib/bibauthorid_tortoise.py

modules/bibauthorid/lib/bibauthorid_webapi.py

modules/bibauthorid/lib/bibauthorid_wedge.py

modules/bibcirculation/lib/bibcirculation_utils.py

modules/bibcirculation/lib/bibcirculationadminlib.py

modules/bibclassify/lib/bibclassify_engine.py

modules/bibclassify/lib/bibclassify_ontology_reader.py

modules/bibclassify/lib/bibclassify_text_extractor.py

modules/bibencode/lib/bibencode_tester.py

modules/bibformat/lib/elements/bfe_issn.py

modules/bibrank/lib/bibrankgkb.py

modules/bibsched/lib/bibsched.py

modules/bibsched/lib/bibtask.py

modules/bibsword/lib/bibsword_client_http.py

modules/bibsword/lib/bibsword_config.py

modules/bibupload/doc/admin/bibupload-admin-guide.webdoc

modules/bibupload/lib/Makefile.am

modules/bibupload/lib/batchuploader_engine.py

modules/bibupload/lib/batchuploader_regression_tests.py

modules/bibupload/lib/batchuploader_webinterface.py

modules/bibupload/lib/bibupload.py

modules/bibupload/lib/bibupload_regression_tests.py

modules/miscutil/lib/Makefile.am

modules/miscutil/lib/invenio_connector.py

modules/miscutil/lib/inveniocfg.py

modules/miscutil/lib/plotextractor_getter.py

modules/miscutil/lib/solrutils.py

modules/miscutil/lib/urlutils.py

modules/miscutil/lib/web_api_key.py

modules/miscutil/lib/web_api_key_tests.py

modules/miscutil/sql/tabbibclean.sql

modules/miscutil/sql/tabcreate.sql

modules/miscutil/sql/tabdrop.sql

modules/webaccess/doc/admin/webaccess-admin-guide.webdoc

modules/webaccess/lib/access_control_config.py

modules/webaccess/lib/external_authentication.py

modules/webaccess/lib/external_authentication_cern.py

modules/webaccess/lib/external_authentication_ldap.py

modules/webaccess/lib/external_authentication_robot.py

modules/webaccess/lib/external_authentication_sso.py

modules/webaccess/lib/webaccess_regression_tests.py

modules/webaccess/lib/webaccessadmin_lib.py

modules/webaccess/web/admin/webaccessadmin.py

modules/webjournal/lib/webjournal_utils.py

modules/webjournal/lib/webjournaladminlib.py

modules/webjournal/lib/widgets/bfe_webjournal_widget_seminars.py

modules/webjournal/lib/widgets/bfe_webjournal_widget_weather.py

modules/websearch/lib/websearch_external_collections_getter.py

modules/websession/lib/Makefile.am

modules/websession/lib/webaccount.py

modules/websession/lib/websession_templates.py

modules/websession/lib/websession_webinterface.py

modules/websession/lib/webuser.py

modules/websession/lib/webuser_config.py

modules/webstat/etc/webstat.cfg

Merge branch 'master' into next
1808b7f2dd1d
Actions