Merge branch 'master' into next
f884a65acd7b
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 22 2013, 10:03.

Description

Merge branch 'master' into next

master: BibDocFile: handling of exceptions in Md5Folder WebSession: session_param_get() default value DocExtract: move mislabelled regression tests BibDocFile: fix for BibDocFile instantiation BibDocFile: implements format renaming BibDocFile: allow doctype renaming WebSearch: better cleaning of word patterns

Conflicts:
modules/websession/lib/webuser.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 22 2013, 10:03

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:f884a65acd7b: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 22 2013, 10:03

Commit	Author	Details	Committed
21f16f678000	Tibor Simko	Merge branch 'maint-1.1'	Feb 22 2013
14b3fde07dad	Samuele Kaplun/Tibor Simko	BibDocFile: handling of exceptions in Md5Folder	Feb 22 2013
54a5c1c339e7	Nikolaos Kasioumis/Tibor Simko	WebSession: session_param_get() default value	Feb 22 2013
67efd585d055	Alessio Deiana/Tibor Simko	DocExtract: move mislabelled regression tests	Feb 22 2013
d5e538755f3b	Lars Holm Nielsen/Tibor Simko	BibDocFile: fix for BibDocFile instantiation	Feb 21 2013
71e8ae30af61	Tibor Simko	Merge branch 'maint-1.1'	Feb 21 2013
37b050db4f68	Ludmila Marian/Tibor Simko	BibDocFile: implements format renaming	Feb 21 2013
d51662ed9464	Ludmila Marian/Tibor Simko	BibDocFile: allow doctype renaming	Feb 21 2013
3430ada2f324	Ludmila Marian/Tibor Simko	WebSearch: better cleaning of word patterns	Feb 21 2013

				Path
	M			modules/bibdocfile/lib/bibdocfile.py
	M			modules/bibdocfile/lib/bibdocfile_regression_tests.py
	M			modules/bibedit/lib/bibedit_engine.py
	M			modules/bibupload/lib/bibupload.py
	M			modules/bibupload/lib/bibupload_regression_tests.py
	M			modules/docextract/lib/Makefile.am
	P			modules/docextract/lib/refextract_api_regression_tests.py Copied from modules/docextract/lib/refextract_api_unit_tests.py
	P			modules/docextract/lib/refextract_api_unit_tests.py Copied to modules/docextract/lib/refextract_api_regression_tests.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/search_engine_unit_tests.py
	M			modules/websearch/lib/websearch_templates.py
	M			modules/websession/lib/webuser.py