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

Authored by kuncar on Jan 5 2017, 08:53.

Description

Merge branch 'maint-2.0' into maint-2.1

maint-2.0: installation: more dependency pinning installation: upper limit on Flask-Babel installation: fix prerequisite package versions iiif: set default cache handler properly global: new blocks for the header template global: mustache templates as text/html records: JavaScript refactoring and bug fixing records: bundle file size reduction records: removal of cloudconnector modal cloudconnector: onedrive icon image global: libraries can be loaded from their CDN installation: fix entry_points for pip7 search: intbitset could be None

Committed

kuncar

Jan 5 2017, 15:35

Parents

Branches

Unknown

Tags

Unknown

References

origin/maint-2.1, maint-2.1

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:f83558cbad71: Merge branch 'maint-2.0' into maint-2.1 (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jan 5 2017, 15:35

Commit	Author	Details	Committed
d6c7b55fe379	Tibor Simko	installation: more dependency pinning	Dec 21 2016
4b7c1cd338f6	Tibor Simko	installation: upper limit on Flask-Babel	May 13 2016
fe9973dd0c3d	Tibor Simko	installation: fix prerequisite package versions	Mar 30 2016
bfb8cc757faf	Harris Tzovanakis	iiif: set default cache handler properly	Nov 27 2015
4118f195c5f1	Yoan Blanc	global: new blocks for the header template	Nov 25 2015
b56a1a22b62d	Yoan Blanc	global: mustache templates as text/html	Nov 25 2015
4c78bbda7ed3	Yoan Blanc	records: JavaScript refactoring and bug fixing	Nov 17 2015
bfa6145e9479	Yoan Blanc	records: bundle file size reduction	Nov 17 2015
47de7951c726	Yoan Blanc	records: removal of cloudconnector modal	Nov 17 2015
a67663d60204	Yoan Blanc	cloudconnector: onedrive icon image	Nov 17 2015
77c18ef73708	Yoan Blanc	global: libraries can be loaded from their CDN	Nov 17 2015
789710949299	Yoan Blanc	installation: fix entry_points for pip7	Nov 2 2015
b23b259b8bca	Yoan Blanc	search: intbitset could be None	Oct 20 2015

				Path
	M			.travis.yml
	M			INSTALL.rst
	M			docs/getting-started/overlay.rst
	M			docs/modules/annotations.rst
	M			invenio/base/bundles.py
	M			invenio/base/templates/base/scripts_base.html
	M			invenio/base/templates/header_base.html
	M			invenio/ext/assets/commands.py
	M			invenio/ext/assets/wrappers.py
	M			invenio/ext/iiif/__init__.py
	M			invenio/ext/script/__init__.py
	M			invenio/legacy/search_engine/__init__.py
	M			invenio/modules/annotations/noteutils.py
	V			invenio/modules/cloudconnector/static/img/cloudconnector/{onedrive_icon.png ← skydrive_icon.png}
	V			invenio/modules/cloudconnector/static/img/cloudconnector/{skydrive_icon.png → onedrive_icon.png}
	M			invenio/modules/jsonalchemy/jsonext/parsers/description_parser.py
	M			invenio/modules/jsonalchemy/jsonext/parsers/legacy_parser.py
	M			invenio/modules/jsonalchemy/jsonext/parsers/memoize_parser.py
	M			invenio/modules/jsonalchemy/jsonext/parsers/only_if_master_value_parser.py
	M			invenio/modules/jsonalchemy/jsonext/parsers/only_if_parser.py
	M			invenio/modules/jsonalchemy/jsonext/parsers/parse_first_parser.py
	M			invenio/modules/jsonalchemy/jsonext/parsers/schema_parser.py
	M			invenio/modules/oauthclient/__init__.py
	M			invenio/modules/records/bundles.py
	M			invenio/modules/records/static/js/records/init.js
	M			invenio/modules/records/static/js/records/records.js
	M			invenio/modules/records/templates/records/files_base.html
	M			invenio/modules/search/testsuite/test_search_external_collections_getter.py
	M			setup.py