Merge branch 'master' into next
8ffc755ad56b
Actions

Authored by kuncar on Dec 16 2014, 20:13.

Description

Merge branch 'master' into next

master: installation: python-twitter requirement update errorlib: tags context fix for sentry WebSearch: inverted collection scores BibFormat: recjson update using bibreformat BibFormat: PEP8 fixes in bibreformat

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

Conflicts:
invenio/legacy/bibformat/bibreformat.py
modules/miscutil/demo/democfgdata.sql
modules/miscutil/lib/errorlib.py
requirements.txt

Committed

kuncar

Dec 17 2014, 08:56

Parents

Branches

Unknown

Tags

Unknown

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:8ffc755ad56b: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Dec 17 2014, 08:56

Commit	Author	Details	Committed
22e5d4e77cde	Sebastian Witowski/Tibor Simko	installation: python-twitter requirement update	Dec 15 2014
229d3b24540e	Esteban J. G. Gabancho/Tibor Simko	errorlib: tags context fix for sentry	Dec 15 2014
82be05a2c222	Esteban J. G. Gabancho/Tibor Simko	WebSearch: inverted collection scores	Dec 15 2014
3854a26b4043	Esteban J. G. Gabancho/Tibor Simko	BibFormat: recjson update using bibreformat	Dec 10 2014
f486bf1d4b5f	Esteban J. G. Gabancho/Tibor Simko	BibFormat: PEP8 fixes in bibreformat	Dec 10 2014

				Path
	M			invenio/legacy/bibformat/bibreformat.py
	M			invenio/legacy/bibformat/doc/admin/bibformat-admin-guide.webdoc
	M			invenio/legacy/bibsched/bibtask_config.py
	M			invenio/legacy/miscutil/sql/tabcreate.sql
	M			invenio/legacy/miscutil/sql/tabfill.sql
	M			invenio/legacy/search_engine/__init__.py
	M			invenio/legacy/websearch/adminlib.py
	M			invenio/legacy/websearch/webcoll.py
	P			invenio/modules/upgrader/upgrades/invenio_2014_08_31_next_collection_tree.py Copied from invenio/modules/upgrader/upgrades/invenio_2012_11_01_lower_user_email.py
	P			invenio/modules/upgrader/upgrades/invenio_2014_11_04_format_recjson.py Copied from invenio/modules/upgrader/upgrades/invenio_2013_01_12_bibrec_master_format.py