Merge branch 'maint-1.1'
f36536355ea2
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 25 2013, 18:23.

Description

Merge branch 'maint-1.1'

maint-1.1: WebSearch: unit test update BibDocFile: fix error in calling register_download BibDocFile: display file upload progress BibDocFile: better JS washing in web UI

Conflicts:
modules/bibdocfile/lib/bibdocfile_templates.py
modules/bibdocfile/lib/bibdocfile_webinterface.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 25 2013, 18:23

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:f36536355ea2: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 25 2013, 18:23

Commit	Author	Details	Committed
b6962617404e	Jan Aage Lavik/Tibor Simko	WebSearch: unit test update	Feb 25 2013
c32dab07ee97	Samuele Kaplun/Tibor Simko	BibDocFile: fix error in calling register_download	Feb 25 2013
84fe3fbf06a2	Jerome Caffaro/Tibor Simko	BibDocFile: display file upload progress	Feb 25 2013
cd88d4ca8b42	Jerome Caffaro/Tibor Simko	BibDocFile: better JS washing in web UI	Feb 25 2013

				Path
	M			modules/bibdocfile/lib/bibdocfile_managedocfiles.py
	M			modules/bibdocfile/lib/bibdocfile_templates.py
	M			modules/bibdocfile/lib/bibdocfile_webinterface.py
	M			modules/websearch/lib/search_engine_unit_tests.py