Merge branch 'maint-1.0' into maint-1.1
fa5832834bb7
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Oct 17 2012, 18:15.

Description

Merge branch 'maint-1.0' into maint-1.1

maint-1.0: WebSearch: allow webcoll to query hidden tags WebSearch: fix for parentheses inside quotes installation: fix for jQuery UI custom

Conflicts:
Makefile.am
modules/websearch/lib/search_engine.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Oct 17 2012, 18:16

Parents

Branches

Unknown

Tags

Unknown

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

Commit	Author	Details	Committed
b2e256b9ef48	Ludmila Marian/Tibor Simko	WebSearch: allow webcoll to query hidden tags	Oct 17 2012
8931080d4e23	Ludmila Marian/Tibor Simko	WebSearch: fix for parentheses inside quotes	Oct 17 2012
b5873b3228f7	Tibor Simko	installation: fix for jQuery UI custom	Oct 17 2012

				Path
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_regression_tests.py
	M			modules/websearch/lib/websearch_webcoll.py