Merge branch 'maint-1.1' into maint-1.2
7e02ddc5f46b
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 2 2016, 13:51.

Description

Merge branch 'maint-1.1' into maint-1.2

maint-1.1: installation: Invenio hosting of jQuery plugins global: silencing MySQL UTF-8 warnings for BLOBs installation: drop instance folder fix installation: pinned JSON-js Medialeement versions

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Jun 2 2016, 17:24

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:7e02ddc5f46b: Merge branch 'maint-1.1' into maint-1.2 (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 2 2016, 17:24

Commit	Author	Details	Committed
d8fc81d9b0a5	Tibor Simko	installation: Invenio hosting of jQuery plugins	Jun 2 2016
aa051349487f	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Jun 1 2016
cdbe6b465302	Tibor Simko	global: silencing MySQL UTF-8 warnings for BLOBs	Jun 1 2016
cc763ca80598	Tibor Simko	installation: drop instance folder fix	May 31 2016
700d1b83dbcd	Tibor Simko	installation: pinned JSON-js Medialeement versions	May 31 2016

				Path
	M			Makefile.am
	M			Vagrantfile
	M			modules/bibdocfile/lib/bibdocfile.py
	M			modules/bibformat/lib/bibreformat.py
	M			modules/bibindex/lib/bibindex_engine.py
	M			modules/bibrank/lib/bibrank_citation_indexer.py
	M			modules/bibrank/lib/bibrank_citerank_indexer.py
	M			modules/bibrank/lib/bibrank_tag_based_indexer.py
	M			modules/bibrank/lib/bibrank_word_indexer.py
	M			modules/bibsort/lib/bibsort_engine.py
	M			modules/bibupload/lib/bibupload.py
	M			modules/bibupload/lib/bibupload_regression_tests.py
	M			modules/miscutil/lib/inveniocfg.py
	M			modules/webaccess/lib/access_control_firerole.py
	M			modules/webbasket/lib/webbasket_dblayer.py
	M			modules/webcomment/lib/webcomment.py
	M			modules/webcomment/lib/webcommentadminlib.py
	M			modules/websearch/lib/websearch_webcoll.py
	M			modules/websession/lib/session.py
	M			requirements.txt
	M			scripts/create-instance.sh
	M			scripts/drop-instance.sh