Merge branch 'maint-2.0' into maint-2.1
c25e4734ea42
Actions

Authored by kuncar on Sep 1 2015, 10:42.

Description

Merge branch 'maint-2.0' into maint-2.1

maint-2.0: installation: post-release version bump Invenio v2.0.6 global: fix flash message CSS class bug tags: fix flash message annotations: fix link display in flash message accounts: fix link display in flash message search: fix flash messages security global: fix standard flash messages security

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>

Committed

kuncar

Sep 1 2015, 10:42

Parents

Branches

Unknown

Tags

Unknown

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:c25e4734ea42: Merge branch 'maint-2.0' into maint-2.1 (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Sep 1 2015, 10:42

Commit	Author	Details	Committed
60783b7384fb	Jiri Kuncar	installation: post-release version bump	Sep 1 2015
5c0dfb279aa0	Jiri Kuncar	Invenio v2.0.6	Sep 1 2015
a4635e22070b	Nicolas Harraudeau	global: fix flash message CSS class bug	Sep 1 2015
bf147811aa1f	Nicolas Harraudeau	tags: fix flash message	Sep 1 2015
4c74ad908254	Nicolas Harraudeau	annotations: fix link display in flash message	Sep 1 2015
5f321468a417	Nicolas Harraudeau	accounts: fix link display in flash message	Sep 1 2015
7f61663da439	Nicolas Harraudeau	search: fix flash messages security	Aug 31 2015
ecb6d6e79282	Nicolas Harraudeau	global: fix standard flash messages security	Aug 31 2015

				Path
	M			MANIFEST.in
	M			NEWS
	M			invenio/base/templates/_macros.html
	M			invenio/ext/script/__init__.py
	M			invenio/modules/accounts/forms.py
	M			invenio/modules/annotations/views.py
	M			invenio/modules/search/templates/search/form/index_base.html
	M			invenio/modules/search/templates/search/results_base.html
	M			invenio/modules/tags/views.py
	M			invenio/version.py