Diffusion invenio-infoscience 26ea183cf945

Merge branch 'master' into next
26ea183cf945
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 21 2012, 17:34.

Description

Merge branch 'master' into next

master: global: more error_page() refactoring global: warning/error message/page refactoring BibSched: smarter sleeping and stopping BibDocFile: proper URL encoding BibAuthorID: bugfixes

Conflicts:
modules/websearch/lib/search_engine.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Sep 24 2012, 12:51

Parents

R3600:1c7304f4f6a0: global: more error_page() refactoring
R3600:31fe18a74f67: WebSearch: "p=el*;rm=citation" test inactivation

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:26ea183cf945: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 24 2012, 12:51

Merged Changes

Commit	Author	Details	Committed
1c7304f4f6a0	Tibor Simko	global: more error_page() refactoring	Sep 21 2012
26fe78ba0876	Samuele Kaplun/Tibor Simko	global: warning/error message/page refactoring	Sep 21 2012
0c2cb42f5faa	Samuele Kaplun/Tibor Simko	BibSched: smarter sleeping and stopping	Sep 20 2012
0fa317ff044c	Samuele Kaplun/Tibor Simko	BibDocFile: proper URL encoding	Sep 20 2012
5a843cba82be	Samuele Carli/Tibor Simko	BibAuthorID: bugfixes	Sep 20 2012

Changes (35)

				Path
	M			modules/bibauthorid/lib/bibauthorid_backinterface.py
	M			modules/bibauthorid/lib/bibauthorid_dbinterface.py
	M			modules/bibauthorid/lib/bibauthorid_matrix_optimization.py
	M			modules/bibauthorid/lib/bibauthorid_merge.py
	M			modules/bibauthorid/lib/bibauthorid_scheduler.py
	M			modules/bibauthorid/lib/bibauthorid_wedge.py
	M			modules/bibcheck/web/admin/bibcheckadmin.py
	D			modules/bibdocfile/bin/bibdocfile
	M			modules/bibdocfile/lib/bibdocfile.py
	M			modules/bibdocfile/lib/bibdocfile_webinterface.py
	M			modules/bibformat/web/admin/bibformatadmin.py
	M			modules/bibindex/web/admin/bibindexadmin.py
	M			modules/bibknowledge/lib/bibknowledgeadmin.py
	M			modules/bibrank/web/admin/bibrankadmin.py
	M			modules/bibsched/lib/bibtask.py
	M			modules/bibsort/web/admin/bibsortadmin.py
	M			modules/oaiharvest/lib/oai_harvest_admin.py
	M			modules/oaiharvest/lib/oai_harvest_templates.py
	M			modules/oaiharvest/web/admin/oaiharvestadmin.py
	M			modules/oairepository/lib/oai_repository_admin.py
	M			modules/oairepository/web/admin/oairepositoryadmin.py
	M			modules/webjournal/web/admin/webjournaladmin.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_templates.py
	M			modules/websearch/web/admin/websearchadmin.py
	M			modules/webstyle/lib/webpage.py
	M			modules/webstyle/lib/webstyle_templates.py
	M			modules/websubmit/lib/websubmit_engine.py
	M			modules/websubmit/lib/websubmit_templates.py
	M			modules/websubmit/lib/websubmit_webinterface.py
	M			modules/websubmit/web/admin/referees.py
	M			modules/websubmit/web/approve.py
	M			modules/websubmit/web/publiline.py
	M			modules/websubmit/web/yourapprovals.py
	M			modules/websubmit/web/yoursubmissions.py