Merge branch 'master' into next
6c026ff640af
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 6 2012, 15:31.

Description

Merge branch 'master' into next

master: WebStyle: avoid double-escaping title in page header WebJournal: update weather widget for new APIs BibConvert: sample BibTeX to MARCXML conversion WebStyle: better IP check in proxy configurations

Committed

Tibor Simko <tibor.simko@cern.ch>

Jan 6 2012, 15:31

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:6c026ff640af: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 6 2012, 15:31

Commit	Author	Details	Committed
cc219c8a1b95	Jerome Caffaro/Tibor Simko	WebStyle: avoid double-escaping title in page header	Jan 6 2012
b7a3472c8383	Jerome Caffaro/Tibor Simko	WebJournal: update weather widget for new APIs	Jan 6 2012
d282f0466542	Øyvind Østlund/Tibor Simko	BibConvert: sample BibTeX to MARCXML conversion	Jan 6 2012
beede1267def	Ludmila Marian/Tibor Simko	WebStyle: better IP check in proxy configurations	Jan 6 2012

				Path
	M			modules/bibcirculation/lib/bibcirculation_webinterface.py
	M			modules/bibconvert/etc/Makefile.am
	A			modules/bibconvert/etc/bibtex2marcxml.cfg
	M			modules/webcomment/lib/webcomment_webinterface.py
	M			modules/webjournal/lib/widgets/bfe_webjournal_widget_weather.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_templates.py
	M			modules/webstyle/lib/webinterface_handler_wsgi.py
	M			modules/webstyle/lib/webstyle_templates.py