Diffusion invenio-infoscience c2d328168565

Merge branch 'maint-1.0' into maint-1.1
c2d328168565
Actions

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

Description

Merge branch 'maint-1.0' into maint-1.1

maint-1.0: WebSession: CSRF tokens in account settings forms BibDocFile: duplicate docname fix

Conflicts:
modules/bibdocfile/lib/bibdocfilecli.py
modules/websession/lib/webaccount.py
modules/websession/lib/websession_regression_tests.py
modules/websession/lib/websession_templates.py
modules/websession/lib/websession_webinterface.py
modules/websession/lib/webuser.py

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

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 26 2014, 14:46

Parents

R3600:5abaede494e1: Merge branch 'maint-1.0' into maint-1.1
R3600:729701ada450: WebSession: CSRF tokens in account settings forms

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:c2d328168565: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 26 2014, 14:46

Merged Changes

	Commit			Author	Details	Committed
	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

Changes (6)

				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