Merge branch 'maint-1.1'
bed633b799f8
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Apr 12 2013, 15:14.

Description

Merge branch 'maint-1.1'

maint-1.1: WebSearch: tweaks SPIRES two-digit search WebSearch: handles "find feb 12" WebAccess: fix variable parsing in robot auth installation: fix for MathJax OS X install issue WebSearch: SPIRES invalid date search fix WebSearch: SPIRES date math search fixes WebApiKey: renames unit tests to regression tests BibSched: increases size of monitor columns WebSubmit: use PyPDF2 if available BibIndex: use human friendly index name

Conflicts:
modules/bibindex/lib/bibindex_engine.py
modules/websearch/lib/websearch_regression_tests.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Apr 12 2013, 15:14

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:bed633b799f8: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Apr 12 2013, 15:14

Commit	Author	Details	Committed
53468c70f697	Alessio Deiana/Tibor Simko	WebSearch: tweaks SPIRES two-digit search	Apr 12 2013
daa0671d0cd3	Alessio Deiana/Tibor Simko	WebSearch: handles "find feb 12"	Apr 12 2013
4815ff91f4ee	Lars Holm Nielsen/Tibor Simko	WebAccess: fix variable parsing in robot auth	Apr 11 2013
07872ff7182a	Lars Holm Nielsen/Tibor Simko	installation: fix for MathJax OS X install issue	Apr 11 2013
dd038f3e9a50	Alessio Deiana/Tibor Simko	WebSearch: SPIRES invalid date search fix	Apr 11 2013
2f23369ef474	Alessio Deiana/Tibor Simko	WebSearch: SPIRES date math search fixes	Apr 10 2013
61e7b97b79d8	Alessio Deiana/Tibor Simko	WebApiKey: renames unit tests to regression tests	Apr 10 2013
8dd0543569d3	Alessio Deiana/Tibor Simko	BibSched: increases size of monitor columns	Apr 10 2013
828e47d571cd	Alessio Deiana/Tibor Simko	WebSubmit: use PyPDF2 if available	Apr 10 2013
84fd52accf36	Jan Aage Lavik/Tibor Simko	BibIndex: use human friendly index name	Apr 9 2013

				Path
	M			INSTALL
	M			Makefile.am
	M			configure-tests.py
	M			modules/bibindex/lib/bibindex_engine.py
	M			modules/bibsched/lib/bibsched.py
	V			modules/miscutil/lib/{web_api_key_regression_tests.py ← web_api_key_unit_tests.py}
	V			modules/miscutil/lib/{web_api_key_unit_tests.py → web_api_key_regression_tests.py}
	M			modules/webaccess/lib/external_authentication_robot.py
	M			modules/websearch/lib/search_engine_query_parser.py
	M			modules/websearch/lib/search_engine_query_parser_unit_tests.py
	M			modules/websearch/lib/websearch_regression_tests.py
	M			modules/websubmit/lib/websubmit_file_converter.py