Diffusion invenio-infoscience b25fce7b473c

general: merge fixes
b25fce7b473c
Actions

Authored by kuncar on Jun 24 2014, 17:07.

Description

general: merge fixes

NOTE This commit is fixing biggest problems after merging 500+ commits from master to next. More commits with feature ports and bugfixes will follow.

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

Details

Committed

kuncar

Jun 25 2014, 16:06

Parents

R3600:e3a98eb3aa25: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:b25fce7b473c: general: merge fixes (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jun 25 2014, 16:06

Changes (99)

		Path
M		invenio/ext/legacy/handler.py
M		invenio/ext/legacy/layout.py
M		invenio/legacy/bibauthorid/dbinterface.py
M		invenio/legacy/bibauthorid/general_utils.py
V		{invenio/legacy/bibauthorid/search_engine.py ← modules/bibauthorid/lib/bibauthorid_search_engine.py}
M		invenio/legacy/bibauthorid/templates.py
M		invenio/legacy/bibauthorid/webinterface.py
M		invenio/legacy/bibcatalog/task.py
M		invenio/legacy/bibcatalog/utils.py
M		invenio/legacy/bibdocfile/api.py
M		invenio/legacy/bibdocfile/managedocfiles.py
M		invenio/legacy/bibedit/engine.py
M		invenio/legacy/bibedit/templates.py
M		invenio/legacy/bibedit/utils.py
M		invenio/legacy/bibformat/adminlib.py
M		invenio/legacy/bibformat/dblayer.py
M		invenio/legacy/bibformat/templates.py
M		invenio/legacy/bibformat/web/admin/bibformatadmin.py
M		invenio/legacy/bibindex/engine.py
M		invenio/legacy/bibrank/citation_grapher.py
M		invenio/legacy/bibrank/citation_indexer.py
M		invenio/legacy/bibrank/record_sorter.py
V		{invenio/legacy/bibrank/selfcites_searcher.py ← modules/bibrank/lib/bibrank_selfcites_searcher.py}
M		invenio/legacy/bibrecord/__init__.py
M		invenio/legacy/bibrecord/doc/hacking/bibrecord-internals.webdoc
M		invenio/legacy/bibsched/monitor.py
M		invenio/legacy/dbquery.py
M		invenio/legacy/docextract/record.py
V		{invenio/legacy/refextract/record.py ← modules/docextract/lib/refextract_record.py}
M		invenio/legacy/search_engine/__init__.py
M		invenio/legacy/search_engine/utils.py
M		invenio/legacy/template.py
V		{invenio/legacy/webauthorprofile/config.py ← modules/webauthorprofile/lib/webauthorprofile_config.py}
V		{invenio/legacy/webauthorprofile/orcidutils.py ← modules/webauthorprofile/lib/webauthorprofile_orcidutils.py}
V		{invenio/legacy/webauthorprofile/publication_grapher.py ← modules/webauthorprofile/lib/webauthorprofile_publication_grapher.py}
M		invenio/legacy/webauthorprofile/webinterface.py
M		invenio/legacy/webcomment/templates.py
M		invenio/legacy/websearch/adminlib.py
M		invenio/legacy/websearch/templates.py
M		invenio/legacy/webstyle/templates.py
P		invenio/modules/authorids/config.py Copied from invenio/modules/upgrader/upgrades/invenio_2013_12_04_seqSTORE_larger_value.py
M		invenio/modules/formatter/__init__.py
M		invenio/modules/formatter/engine.py
M		invenio/modules/formatter/format_elements/bfe_arxiv_link.py
M		invenio/modules/formatter/format_elements/bfe_authors.py
M		invenio/modules/formatter/format_elements/bfe_authors_parent.py
M		invenio/modules/formatter/format_elements/bfe_citation_suggestion_hepdata.py
M		invenio/modules/formatter/format_elements/bfe_hepdata_table.py
M		invenio/modules/formatter/format_elements/bfe_meta.py
M		invenio/modules/formatter/format_elements/bfe_meta_files.py
M		invenio/modules/formatter/format_elements/bfe_meta_opengraph_image.py
M		invenio/modules/formatter/format_elements/bfe_webauthorpage_affiliations.py
M		invenio/modules/formatter/format_elements/bfe_webauthorpage_data.py
M		invenio/modules/formatter/models.py
M		invenio/modules/indexer/tokenizers/BibIndexDOITokenizer.py
M		invenio/modules/indexer/tokenizers/BibIndexFilenameTokenizer.py
M		invenio/modules/indexer/tokenizers/BibIndexFilteringTokenizer.py
M		invenio/modules/indexer/tokenizers/BibIndexMultiFieldTokenizer.py
M		invenio/modules/indexer/tokenizers/BibIndexRecJsonTokenizer.py
M		invenio/modules/indexer/tokenizers/BibIndexStringTokenizer.py
P		invenio/modules/scheduler/config.py Copied from invenio/modules/upgrader/upgrades/invenio_2013_12_04_seqSTORE_larger_value.py
M		invenio/modules/scheduler/tasklets/bst_create_icons.py
M		invenio/modules/scheduler/tasklets/bst_create_related_formats.py
M		invenio/modules/upgrader/upgrades/invenio_2012_10_31_WebAuthorProfile_bibformat_dependency_update.py
M		invenio/modules/upgrader/upgrades/invenio_2013_03_18_aidPERSONIDDATA_last_updated.py
M		invenio/modules/upgrader/upgrades/invenio_2013_03_18_wapCACHE_object_value_longblob.py
M		invenio/modules/upgrader/upgrades/invenio_2013_03_28_bibindex_bibrank_type_index.py
M		invenio/modules/upgrader/upgrades/invenio_2013_09_02_new_bibARXIVPDF.py
M		invenio/modules/upgrader/upgrades/invenio_2013_10_11_bibHOLDINGPEN_longblob.py
P		invenio/modules/upgrader/upgrades/invenio_2013_12_04_seqSTORE_larger_value.py Copied to multiple locations: invenio/modules/authorids/config.py invenio/modules/scheduler/config.py
A	(dir)	invenio/utils/hepdata/
V		{invenio/utils/hepdata/__init__.py ← modules/miscutil/lib/hepdatautils.py}
V		{invenio/utils/hepdata/display.py ← modules/miscutil/lib/hepdatadisplayutils.py}
V		{modules/bibauthorid/lib/bibauthorid_search_engine.py → invenio/legacy/bibauthorid/search_engine.py}
M		modules/bibcatalog/lib/ticket_templates/metadata_curation.py
M		modules/bibcheck/lib/bibcheck_task.py
M		modules/bibcheck/lib/plugins/crossref_checker.py
M		modules/bibcheck/lib/plugins/doi.py
M		modules/bibcheck/lib/plugins/files.py
M		modules/bibcheck/lib/plugins/texkey.py
D		modules/bibrank
D		modules/bibrank/lib
V		{modules/bibrank/lib/bibrank_selfcites_searcher.py → invenio/legacy/bibrank/selfcites_searcher.py}
M		modules/docextract/lib/docextract_convert_journals.py
M		modules/docextract/lib/docextract_convert_journals_unit_tests.py
M		modules/docextract/lib/docextract_record_unit_tests.py
V		{modules/docextract/lib/refextract_record.py → invenio/legacy/refextract/record.py}
V		{modules/miscutil/lib/hepdatadisplayutils.py → invenio/utils/hepdata/display.py}
V		{modules/miscutil/lib/hepdatautils.py → invenio/utils/hepdata/__init__.py}
M		modules/miscutil/lib/hepdatautils_unit_tests.py
M		modules/miscutil/lib/sequtils_texkey.py
M		modules/oaiharvest/lib/oai_harvest_utils.py
M		modules/pdfchecker/lib/arxiv_pdf_checker.py
M		modules/webauthorlist/lib/authorlist_engine.py
M		modules/webauthorlist/lib/authorlist_webinterface.py
V		{modules/webauthorprofile/lib/webauthorprofile_config.py → invenio/legacy/webauthorprofile/config.py}
V		{modules/webauthorprofile/lib/webauthorprofile_orcidutils.py → invenio/legacy/webauthorprofile/orcidutils.py}
V		{modules/webauthorprofile/lib/webauthorprofile_publication_grapher.py → invenio/legacy/webauthorprofile/publication_grapher.py}
M		modules/webstyle/lib/webdoc_info_webinterface.py