Merge branch 'maint-1.0'
0a1add129567
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 10 2012, 17:16.

Description

Merge branch 'maint-1.0'

maint-1.0: BibUpload: clarify correct/replace mode help WebSession: prevent nickname modification WebSession: fix possibly undefined variables WebJournal: catch ValueError when reading cache

Conflicts:
modules/bibupload/lib/bibupload.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 10 2012, 17:16

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:0a1add129567: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 10 2012, 17:16

Commit	Author	Details	Committed
730a7c48119e	Jerome Caffaro/Tibor Simko	BibUpload: clarify correct/replace mode help	Aug 10 2012
e7df68179c4d	Jerome Caffaro/Tibor Simko	WebSession: prevent nickname modification	Aug 10 2012
297b8a1f7a4e	Jerome Caffaro/Tibor Simko	WebSession: fix possibly undefined variables	Aug 10 2012
aa479d0d8d47	Jerome Caffaro/Tibor Simko	WebJournal: catch ValueError when reading cache	Aug 10 2012

				Path
	M			modules/bibupload/doc/admin/bibupload-admin-guide.webdoc
	M			modules/bibupload/lib/bibupload.py
	M			modules/webjournal/lib/webjournal_utils.py
	M			modules/websession/lib/websession_webinterface.py