Merge branch 'master' into next
ab6eec290a0b
Actions

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

Description

Merge branch 'master' into next

master: htmlutils: improve js string escaping mathpreview: js-based math preview panel htmlutils: improve js string escaping htmlutils: fix single quote escaping solrutils: clean unit and regression test suite

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 8 2013, 13:10

Parents

Branches

Unknown

Tags

Unknown

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

Commit	Author	Details	Committed
d5b3c6342b89	Tibor Simko	Merge branch 'maint-1.1'	Feb 8 2013
d05f801abe6c	Jerome Caffaro/Tibor Simko	htmlutils: improve js string escaping	Feb 8 2013
407b3dd4c0a9	Jerome Caffaro/Tibor Simko	mathpreview: js-based math preview panel	Feb 8 2013
86f6acbca4fe	Jerome Caffaro/Tibor Simko	htmlutils: improve js string escaping	Feb 8 2013
051df81d9bf3	Tibor Simko	Merge branch 'maint-1.1'	Feb 8 2013
dd8a71e6865f	Jerome Caffaro/Tibor Simko	htmlutils: fix single quote escaping	Feb 8 2013
7ebb5b523935	Patrick Glauner/Tibor Simko	solrutils: clean unit and regression test suite	Feb 6 2013

				Path
	M			Makefile.am
	M			config/invenio.conf
	M			modules/bibformat/lib/elements/bfe_bookmark.py
	M			modules/miscutil/lib/Makefile.am
	M			modules/miscutil/lib/htmlutils.py
	M			modules/miscutil/lib/htmlutils_unit_tests.py
	A			modules/miscutil/lib/jquery.mathpreview.js
	M			modules/miscutil/lib/jsonutils.py
	P			modules/miscutil/lib/jsonutils_unit_tests.py Copied from modules/miscutil/lib/cache.py
	V			modules/miscutil/lib/{solrutils_regression_tests.py ← solrutils_unit_tests.py}
	V			modules/miscutil/lib/{solrutils_unit_tests.py → solrutils_regression_tests.py}
	M			modules/webstyle/css/invenio.css
	M			modules/websubmit/doc/submit-guide.webdoc
	M			modules/websubmit/lib/websubmit_engine.py
	M			modules/websubmit/lib/websubmit_templates.py