Merge branch 'maint-2.0'
307912d40b4b
Actions

Authored by kuncar on Mar 25 2015, 15:09.

Description

Merge branch 'maint-2.0'

maint-2.0: template: 'u' filter addition template: PEP8/257 code style improvements global: jinja2hacks deprecation and usage warning docs: pu mentions left overs admin: fix select2 by adding bundle

Committed

kuncar

Mar 25 2015, 15:09

Parents

Branches

Unknown

Tags

Unknown

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:307912d40b4b: Merge branch 'maint-2.0' (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Mar 25 2015, 15:09

Commit	Author	Details	Committed
9919c80ab37d	Jiri Kuncar	template: 'u' filter addition	Mar 25 2015
aead4d1db509	Jiri Kuncar	template: PEP8/257 code style improvements	Mar 25 2015
552d1c4cca76	Jiri Kuncar	global: jinja2hacks deprecation and usage warning	Mar 25 2015
88ad5de6c49b	Lars Holm Nielsen	docs: pu mentions left overs	Mar 25 2015
4092dd839327	Jiri Kuncar	admin: fix select2 by adding bundle	Mar 25 2015

				Path
	M			INSTALL.rst
	M			invenio/base/bundles.py
	P			invenio/base/static/js/admin.js Copied from invenio/modules/accounts/static/js/accounts/init.js
	M			invenio/base/static/js/settings.js
	M			invenio/base/templates/admin_base.html
	M			invenio/ext/jinja2hacks.py
	M			invenio/ext/template/__init__.py