Merge branch 'master' into next
Conflicts:
.gitignore
.travis.yml
INSTALL
Makefile.am
config/invenio.conf
configure.ac
invenio/ext/email/__init.py
invenio/ext/legacy/layout.py
invenio/legacy/batchuploader/cli.py
invenio/legacy/batchuploader/engine.py
invenio/legacy/bibauthorid/backinterface.py
invenio/legacy/bibauthorid/cli.py
invenio/legacy/bibauthorid/cluster_set.py
invenio/legacy/bibauthorid/comparison.py
invenio/legacy/bibauthorid/daemon.py
invenio/legacy/bibauthorid/dbinterface.py
invenio/legacy/bibauthorid/frontinterface.py
invenio/legacy/bibauthorid/merge.py
invenio/legacy/bibauthorid/name_utils.py
invenio/legacy/bibauthorid/personid_maintenance.py
invenio/legacy/bibauthorid/prob_matrix.py
invenio/legacy/bibauthorid/rabbit.py
invenio/legacy/bibauthorid/recipes.py
invenio/legacy/bibauthorid/scripts/bibauthorid.py
invenio/legacy/bibauthorid/searchinterface.py
invenio/legacy/bibauthorid/templates.py
invenio/legacy/bibauthorid/tortoise.py
invenio/legacy/bibauthorid/webapi.py
invenio/legacy/bibauthorid/webinterface.py
invenio/legacy/bibauthorid/wedge.py
invenio/legacy/bibcatalog/api.py
invenio/legacy/bibcatalog/doc/hacking/hacking/bibcatalog-api.webdoc
invenio/legacy/bibcatalog/system_email.py
invenio/legacy/bibcatalog/system_rt.py
invenio/legacy/bibcatalog/templates.py
invenio/legacy/bibcheck/doc/admin/bibcheck-admin-guide.webdoc
invenio/legacy/bibcheck/sample.cfg
invenio/legacy/bibcheck/web/admin/bibcheckadmin.py
invenio/legacy/bibclassify/daemon.py
invenio/legacy/bibclassify/engine.py
invenio/legacy/bibclassify/ontology_reader.py
invenio/legacy/bibdocfile/api.py
invenio/legacy/bibdocfile/cli.py
invenio/legacy/bibdocfile/webinterface.py
invenio/legacy/bibedit/db_layer.py
invenio/legacy/bibedit/engine.py
invenio/legacy/bibedit/templates.py
invenio/legacy/bibedit/utils.py
invenio/legacy/bibedit/webinterface.py
invenio/legacy/bibeditmulti/templates.py
invenio/legacy/bibexport/sitemap.py
invenio/legacy/bibformat/bibreformat.py
invenio/legacy/bibformat/templates.py
invenio/legacy/bibformat/web/admin/bibformatadmin.py
invenio/legacy/bibindex/engine.py
invenio/legacy/bibmatch/engine.py
invenio/legacy/bibmatch/validator.py
invenio/legacy/bibmerge/engine.py
invenio/legacy/bibmerge/webinterface.py
invenio/legacy/bibrank/citation_grapher.py
invenio/legacy/bibrank/citation_indexer.py
invenio/legacy/bibrank/citation_searcher.py
invenio/legacy/bibrank/citerank_indexer.py
invenio/legacy/bibrank/cli.py
invenio/legacy/bibrank/downloads_grapher.py
invenio/legacy/bibrank/grapher.py
invenio/legacy/bibrank/record_sorter.py
invenio/legacy/bibrank/selfcites_indexer.py
invenio/legacy/bibrank/selfcites_task.py
invenio/legacy/bibrank/tag_based_indexer.py
invenio/legacy/bibrank/word_searcher.py
invenio/legacy/bibrecord/init.py
invenio/legacy/bibsched/bibtask.py
invenio/legacy/bibsched/cli.py
invenio/legacy/bibsched/webapi.py
invenio/legacy/bibsched/webinterface.py
invenio/legacy/bibupload/engine.py
invenio/legacy/dbquery.py
invenio/legacy/docextract/webinterface.py
invenio/legacy/external_authentication/oauth2.py
invenio/legacy/inveniocfg.py
invenio/legacy/miscutil/dbdump.py
invenio/legacy/miscutil/sql/tabdrop.sql
invenio/legacy/miscutil/sql/tabfill.sql
invenio/legacy/oaiharvest/admin.py
invenio/legacy/oaiharvest/dblayer.py
invenio/legacy/oaiharvest/web/admin/oai_harvest_admin.js
invenio/legacy/oaiharvest/web/admin/oaiharvestadmin.py
invenio/legacy/oairepository/server.py
invenio/legacy/oairepository/updater.py
invenio/legacy/refextract/api.py
invenio/legacy/refextract/cli.py
invenio/legacy/refextract/engine.py
invenio/legacy/refextract/kbs.py
invenio/legacy/refextract/linker.py
invenio/legacy/refextract/tag.py
invenio/legacy/refextract/task.py
invenio/legacy/refextract/xml.py
invenio/legacy/search_engine/init.py
invenio/legacy/search_engine/query_parser.py
invenio/legacy/search_engine/summarizer.py
invenio/legacy/webauthorprofile/corefunctions.py
invenio/legacy/webauthorprofile/daemon.py
invenio/legacy/webauthorprofile/dbapi.py
invenio/legacy/webauthorprofile/interface.py
invenio/legacy/webauthorprofile/templates.py
invenio/legacy/webauthorprofile/webinterface.py
invenio/legacy/webbasket/errors.py
invenio/legacy/webjournal/api.py
invenio/legacy/websearch/adminlib.py
invenio/legacy/websearch/templates.py
invenio/legacy/websession/inveniogc.py
invenio/legacy/webstat/engine.py
invenio/legacy/webstyle/templates.py
invenio/legacy/webstyle/webdoc.py
invenio/legacy/websubmit/inveniounoconv.py
invenio/legacy/websubmit/templates.py
invenio/legacy/webuser.py
invenio/legacy/wsgi/init.py
invenio/modules/access/local_config.py
invenio/modules/classifier/testsuite/test_classifier.py
invenio/modules/formatter/engine.py
invenio/modules/formatter/engines/xslt.py
invenio/modules/formatter/format_elements/bfe_aid_authors.py
invenio/modules/formatter/format_elements/bfe_authors.py
invenio/modules/formatter/format_elements/bfe_bookmark.py
invenio/modules/formatter/format_elements/bfe_copyright.py
invenio/modules/formatter/format_elements/bfe_edit_files.py
invenio/modules/formatter/format_elements/bfe_edit_record.py
invenio/modules/formatter/format_elements/bfe_editors.py
invenio/modules/formatter/format_elements/bfe_fulltext.py
invenio/modules/formatter/format_elements/bfe_fulltext_mini.py
invenio/modules/formatter/format_elements/bfe_keywords.py
invenio/modules/formatter/format_elements/bfe_meta.py
invenio/modules/formatter/format_elements/bfe_photo_resources_brief.py
invenio/modules/formatter/format_elements/bfe_photos.py
invenio/modules/formatter/format_elements/bfe_plots.py
invenio/modules/formatter/format_elements/bfe_plots_thumb.py
invenio/modules/formatter/format_elements/bfe_references.py
invenio/modules/formatter/format_elements/bfe_sciencewise.py
invenio/modules/formatter/format_elements/bfe_sword_push.py
invenio/modules/formatter/format_elements/bfe_video_platform_suggestions.py
invenio/modules/formatter/format_elements/bfe_webauthorpage_affiliations.py
invenio/modules/formatter/testsuite/test_formatter_engine.py
invenio/modules/formatter/utils.py
invenio/modules/indexer/tokenizers/BibIndexFulltextTokenizer.py
invenio/modules/matcher/testsuite/test_matcher.py
invenio/modules/pages/templates/pages/default_base.html
invenio/modules/search/testsuite/test_search_engine_query_parser.py
invenio/modules/search/testsuite/test_search_external_collections_getter.py
invenio/modules/search/testsuite/test_views.py
invenio/modules/textminer/testsuite/test_textminer_references.py
invenio/testsuite/test_emergency_recipients.py
invenio/testsuite/test_plotextractor.py
invenio/testsuite/test_utils_date.py
invenio/testsuite/test_utils_text.py
invenio/testsuite/test_utils_url.py
invenio/utils/crossref.py
invenio/utils/date.py
invenio/utils/plotextractor/cli.py
invenio/utils/plotextractor/getter.py
invenio/utils/plotextractor/output_utils.py
invenio/utils/plotextractor/plotextractor_dummy.png
invenio/utils/shell.py
modules/Makefile.am
modules/bibauthorid/lib/Makefile.am
modules/bibauthorid/lib/bibauthorid_webauthorprofileinterface.py
modules/bibcatalog/Makefile.am
modules/bibcatalog/bin/Makefile.am
modules/bibcatalog/doc/admin/Makefile.am
modules/bibcatalog/lib/Makefile.am
modules/bibcheck/Makefile.am
modules/bibcheck/bin/Makefile.am
modules/bibcheck/doc/Makefile.am
modules/bibcheck/etc/Makefile.am
modules/bibcirculation/lib/Makefile.am
modules/bibedit/lib/Makefile.am
modules/bibedit/lib/bibedit_web_tests.py
modules/bibedit/web/Makefile.am
modules/bibformat/etc/format_templates/Makefile.am
modules/bibformat/etc/output_formats/HD.bfo
modules/bibformat/etc/output_formats/Makefile.am
modules/bibformat/lib/bibformat.py
modules/bibformat/lib/bibformat_dblayer.py
modules/bibformat/lib/bibformat_regression_tests.py
modules/bibformat/lib/bibformat_web_tests.py
modules/bibformat/lib/elements/Makefile.am
modules/bibindex/lib/bibindex_regression_tests.py
modules/bibindex/lib/bibindexadmin_regression_tests.py
modules/bibmatch/lib/bibmatch_regression_tests.py
modules/bibrank/lib/Makefile.am
modules/bibrank/lib/bibrank_citation_indexer_regression_tests.py
modules/bibrank/lib/bibrank_regression_tests.py
modules/bibrank/lib/bibrank_selfcites_regression_tests.py
modules/bibupload/lib/batchuploader_regression_tests.py
modules/bibupload/lib/bibupload_regression_tests.py
modules/bibupload/lib/bibupload_revisionverifier_regression_tests.py
modules/docextract/bin/Makefile.am
modules/docextract/lib/Makefile.am
modules/docextract/lib/docextract_webinterface_unit_tests.py
modules/docextract/lib/refextract_api_regression_tests.py
modules/docextract/lib/refextract_regression_tests.py
modules/miscutil/bin/Makefile.am
modules/miscutil/lib/Makefile.am
modules/miscutil/lib/init__.py
modules/miscutil/lib/errorlib.py
modules/miscutil/lib/intbitset.c
modules/miscutil/lib/intbitset.pyx
modules/miscutil/lib/invenio_connector_regression_tests.py
modules/miscutil/lib/inveniocfg_upgrader.py
modules/miscutil/lib/inveniocfg_upgrader_unit_tests.py
modules/miscutil/lib/plotextractor_regression_tests.py
modules/miscutil/lib/sequtils_regression_tests.py
modules/miscutil/lib/testutils.py
modules/miscutil/lib/testutils_regression_tests.py
modules/oaiharvest/lib/Makefile.am
modules/oaiharvest/lib/oai_harvest_daemon.py
modules/oaiharvest/lib/oai_harvest_web_tests.py
modules/oaiharvest/web/admin/Makefile.am
modules/oairepository/lib/oai_repository_regression_tests.py
modules/pdfchecker/bin/Makefile.am
modules/webalert/lib/webalert_regression_tests.py
modules/webauthorprofile/lib/Makefile.am
modules/webauthorprofile/lib/webauthorprofile_regression_tests.py
modules/webjournal/etc/AtlantisTimes_Detailed.bft
modules/websearch/lib/Makefile.am
modules/websearch/lib/search_engine_utils.py
modules/websearch/lib/websearch_regression_tests.py
modules/webstyle/img/Makefile.am
modules/webstyle/lib/Makefile.am
modules/webstyle/lib/invenio.wsgi
requirements-extras.txt
requirements.txt