Merge branch 'master' into next
33c78178a35e
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 10 2012, 11:11.

Description

Merge branch 'master' into next

master: WebSearch: external collection search fix BibAuthorID: Python-2.4 compatibility fix WebSearch: get_collection_reclist() fix dbquery: MySQL 5.5.3+ autocommit fix I18N: updates to German translation BibHarvest: OAI harvesting via HTTP proxy inveniogc: add back -r flag from da693f5 BibAuthorID: consolidation fixes installation: format table filling fix

Committed

Tibor Simko <tibor.simko@cern.ch>

Sep 10 2012, 11:11

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:33c78178a35e: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 10 2012, 11:11

Commit	Author	Details	Committed
9cc628de63bf	Tibor Simko	Merge branch 'maint-1.0'	Sep 10 2012
e6146db8c612	Ludmila Marian/Tibor Simko	WebSearch: external collection search fix	Sep 10 2012
79f36bbb6836	Samuele Carli/Tibor Simko	BibAuthorID: Python-2.4 compatibility fix	Sep 7 2012
f80eda4b1772	Tibor Simko	Merge branch 'maint-1.0'	Sep 7 2012
63351c6ddbf7	Miguel Martín/Tibor Simko	WebSearch: get_collection_reclist() fix	Sep 7 2012
7f63d3c31ce9	Samuele Kaplun/Tibor Simko	dbquery: MySQL 5.5.3+ autocommit fix	Sep 7 2012
3d0af5673fac	Tibor Simko	Merge branch 'maint-1.0'	Sep 7 2012
625baba0bdc9	Alexander Wagner/Tibor Simko	I18N: updates to German translation	Sep 7 2012
c990b4a2ce95	Stefan Hesselbach/Tibor Simko	BibHarvest: OAI harvesting via HTTP proxy	Sep 7 2012
a147dbd8d93c	Jan Aage Lavik/Tibor Simko	inveniogc: add back -r flag from da693f5	Sep 7 2012
42c41cadcb3b	Samuele Carli/Tibor Simko	BibAuthorID: consolidation fixes	Sep 7 2012
9def5dc93849	Tibor Simko	installation: format table filling fix	Sep 5 2012

				Path
	M			modules/bibauthorid/lib/bibauthorid_cluster_set.py
	M			modules/bibauthorid/lib/bibauthorid_config.py
	M			modules/bibauthorid/lib/bibauthorid_dbinterface.py
	M			modules/bibauthorid/lib/bibauthorid_rabbit.py
	M			modules/bibauthorid/lib/bibauthorid_scheduler.py
	M			modules/bibauthorid/lib/bibauthorid_tortoise.py
	M			modules/bibauthorid/lib/bibauthorid_wedge.py
	M			modules/bibharvest/lib/oai_harvest_getter.py
	M			modules/miscutil/lib/dbquery.py
	M			modules/miscutil/sql/tabfill.sql
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_external_collections.py
	M			modules/websession/lib/inveniogc.py
	M			modules/websession/lib/webuser.py
	M			po/de.po