Merge branch 'maint-1.1'
c186043c0fed
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Apr 4 2013, 16:50.

Description

Merge branch 'maint-1.1'

maint-1.1: BibClassify: escape keywords in tag cloud and MARCXML WebComment: escape review "title" WebSession: fix for list of admin activities

Conflicts:
modules/webcomment/lib/webcomment_templates.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Apr 4 2013, 16:50

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:c186043c0fed: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Apr 4 2013, 16:50

Commit	Author	Details	Committed
8e9c004f5dd3	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Apr 4 2013
156d7f0ffbab	Tibor Simko	Merge branch 'maint-0.99' into maint-1.0	Apr 4 2013
04116f326260	Jerome Caffaro/Tibor Simko	BibClassify: escape keywords in tag cloud and MARCXML	Apr 4 2013
28d35558729e	Jerome Caffaro/Tibor Simko	WebComment: escape review "title"	Apr 4 2013
1d1eff7a7e2f	Samuele Kaplun/Tibor Simko	WebSession: fix for list of admin activities	Apr 3 2013

				Path
	M			modules/bibclassify/lib/bibclassify_engine.py
	M			modules/bibclassify/lib/bibclassify_templates.py
	M			modules/bibclassify/lib/bibclassify_webinterface.py
	M			modules/webcomment/lib/webcomment_templates.py
	M			modules/websession/lib/websession_templates.py