Diffusion invenio-infoscience d58147e92387

Merge branch 'maint-1.1'
d58147e92387
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 26 2014, 15:47.

Description

Merge branch 'maint-1.1'

maint-1.1: WebSession: CSRF token in API key settings form WebSession: CSRF tokens in account settings forms BibDocFile: duplicate docname fix I18N: fix gender problem in a French translation

Merge note: CSRF generation and verifications functions amended to reflect that session_param_get() now returns None instead of raising KeyError.

Conflicts:
modules/websession/lib/webaccount.py
modules/websession/lib/websession_templates.py
modules/websession/lib/websession_webinterface.py
po/fr.po

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 26 2014, 17:08

Parents

R3600:0ec4b95a7591: WebSession: CSRF token in API key settings form
R3600:b0c92b46eb8a: WebSubmit: more robust JavaScript check

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:d58147e92387: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 26 2014, 17:08

Merged Changes

Commit	Author	Details	Committed
0ec4b95a7591	Tibor Simko	WebSession: CSRF token in API key settings form	Aug 26 2014
c2d328168565	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Aug 26 2014
729701ada450	Tibor Simko	WebSession: CSRF tokens in account settings forms	Aug 26 2014
a1f3e33170ed	Jan Aage Lavik/Tibor Simko	BibDocFile: duplicate docname fix	Aug 25 2014
5abaede494e1	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Aug 23 2014
aba5932488be	Ludmila Marian/Tibor Simko	I18N: fix gender problem in a French translation	Aug 22 2014

Changes (7)

				Path
	M			modules/bibdocfile/lib/bibdocfilecli.py
	M			modules/websession/lib/webaccount.py
	M			modules/websession/lib/websession_regression_tests.py
	M			modules/websession/lib/websession_templates.py
	M			modules/websession/lib/websession_webinterface.py
	M			modules/websession/lib/webuser.py
	M			po/fr.po