Merge branch 'master' into aaa
a9f32619b79e
Actions

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

Description

Merge branch 'master' into aaa

master: WebSession: restore authentication method choice WebSubmit: new Notify_URL end-submission function BibSched: new bst_notify_url tasklet BibUpload: clarify correct/replace mode help WebSession: prevent nickname modification WebSession: fix possibly undefined variables WebJournal: catch ValueError when reading cache WebJournal: add title separator

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 10 2012, 17:47

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:a9f32619b79e: Merge branch 'master' into aaa (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 10 2012, 17:47

Commit	Author	Details	Committed
5856241f69f7	Jerome Caffaro/Tibor Simko	WebSession: restore authentication method choice	Aug 10 2012
a6846fdfb9a4	Jerome Caffaro/Tibor Simko	WebSubmit: new Notify_URL end-submission function	Aug 10 2012
76028db90abd	Jerome Caffaro/Tibor Simko	BibSched: new bst_notify_url tasklet	Aug 10 2012
0a1add129567	Tibor Simko	Merge branch 'maint-1.0'	Aug 10 2012
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
7fce7231ee69	Ludmila Marian/Tibor Simko	WebJournal: add title separator	Aug 10 2012

				Path
	M			Makefile.am
	M			modules/bibsched/lib/tasklets/Makefile.am
	A			modules/bibsched/lib/tasklets/bst_notify_url.py
	M			modules/bibupload/doc/admin/bibupload-admin-guide.webdoc
	M			modules/bibupload/lib/bibupload.py
	M			modules/miscutil/sql/tabfill.sql
	M			modules/webjournal/lib/elements/bfe_webjournal_sub_navigation.py
	M			modules/webjournal/lib/webjournal_utils.py
	M			modules/websession/lib/websession_templates.py
	M			modules/websession/lib/websession_webinterface.py
	M			modules/websubmit/lib/functions/Makefile.am
	A			modules/websubmit/lib/functions/Notify_URL.py