Merge branch 'maint-1.0'
644e9c1af8c9
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 22 2012, 15:00.

Description

Merge branch 'maint-1.0'

maint-1.0: BibFormat: fix format validation report WebSubmit: capitalise doctypes in Doc File Manager WebSession: simplify HTML markup WebAlert: simplify HTML markup

Conflicts:
modules/websession/lib/websession_templates.py
modules/websubmit/lib/websubmit_webinterface.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Jun 22 2012, 15:00

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:644e9c1af8c9: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 22 2012, 15:00

Commit	Author	Details	Committed
6ff36a40b7c8	Jerome Caffaro/Tibor Simko	BibFormat: fix format validation report	Jun 22 2012
14bbdffed55d	Jerome Caffaro/Tibor Simko	WebSubmit: capitalise doctypes in Doc File Manager	Jun 22 2012
f1a32dfc806e	Jerome Caffaro/Tibor Simko	WebSession: simplify HTML markup	Jun 22 2012
cc15e0bccc45	Jerome Caffaro/Tibor Simko	WebAlert: simplify HTML markup	Jun 22 2012

				Path
	M			modules/bibformat/lib/bibformatadminlib.py
	M			modules/webalert/lib/webalert_templates.py
	M			modules/websession/lib/websession_templates.py
	M			modules/websubmit/lib/websubmit_webinterface.py