Merge branch 'maint-1.0' into maint-1.1
007b9f577c48
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Oct 16 2012, 10:35.

Description

Merge branch 'maint-1.0' into maint-1.1

maint-1.0: WebSearch: 'verbose' mode available to admins only WebSearch: external search XSS vulnerability fix

Conflicts:
modules/websearch/lib/websearch_external_collections.py
modules/websearch/lib/websearch_webinterface.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Oct 16 2012, 10:35

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:007b9f577c48: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Oct 16 2012, 10:35

	Commit			Author	Details	Committed
	0e0f3e518c46			Ludmila Marian/Tibor Simko	WebSearch: 'verbose' mode available to admins only	Oct 16 2012
	c089ce6cee2d			Ludmila Marian/Tibor Simko	WebSearch: external search XSS vulnerability fix	Oct 15 2012

				Path
	M			modules/websearch/lib/websearch_external_collections.py
	M			modules/websearch/lib/websearch_webinterface.py