Diffusion invenio-infoscience 4431e581423d

Merge branch 'master' into next
4431e581423d
Actions

Authored by kuncar on Jan 15 2015, 08:45.

Description

Merge branch 'master' into next

master: BibClassify: ontology cache check improvement (PR #2671) BibFormat: new BFO for authority records BibFormat: links to public resources of authors BibFormat: better display of authority records BibField: new CFG_BIBFORMAT_HIDDEN_RECJSON_FIELDS BibCatalog: ticket_id type is now string BibField: better create_record error catching WebSearch: new test case for pattern-limit queries WebSearch: search results pattern limit fix

Conflicts:
invenio/legacy/bibcatalog/system_rt.py
invenio/legacy/bibclassify/ontology_reader.py
invenio/legacy/search_engine/__init__.py
invenio/modules/formatter/format_elements/bfe_authority_author.py
invenio/modules/formatter/format_elements/bfe_authority_control_no.py
invenio/modules/formatter/format_elements/bfe_authority_institute.py
invenio/modules/formatter/format_elements/bfe_authority_journal.py
invenio/modules/formatter/format_elements/bfe_authority_subject.py
invenio/modules/formatter/format_elements/bfe_authors.py
invenio/modules/tags/templates/tags/user_settings_base.html
modules/bibfield/lib/bibfield.py
modules/bibfield/lib/bibfield_marcreader.py
modules/bibfield/lib/bibfield_regression_tests.py
modules/bibformat/etc/format_templates/Makefile.am
modules/bibformat/etc/output_formats/HB.bfo
modules/bibformat/etc/output_formats/HD.bfo
modules/bibformat/lib/bibformat_regression_tests.py
modules/bibformat/lib/elements/Makefile.am
modules/miscutil/lib/Makefile.am
modules/oaiharvest/lib/oai_harvest_daemon.py
modules/websearch/lib/websearch_regression_tests.py
modules/webstyle/img/Makefile.am

Details

Committed

kuncar

Jan 15 2015, 09:39

Parents

R3600:2ad9e80b1832: BibClassify: ontology cache check improvement
R3600:1a7c8bac803c: formatter: filtered hidden fields in recjson

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:4431e581423d: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jan 15 2015, 09:39

Merged Changes

Commit	Author	Details	Committed
2ad9e80b1832	Jan Aage Lavik/Tibor Simko	BibClassify: ontology cache check improvement	Jan 14 2015
9c74ab4385f4	Avraam Tsantekidis/Tibor Simko	BibFormat: new BFO for authority records	Jan 14 2015
eaa655b6176f	Avraam Tsantekidis/Tibor Simko	BibFormat: links to public resources of authors	Jan 14 2015
9bc4bf0d03e3	Avraam Tsantekidis/Tibor Simko	BibFormat: better display of authority records	Jan 14 2015
8076dc3f2899	Samuele Kaplun/Tibor Simko	BibField: new CFG_BIBFORMAT_HIDDEN_RECJSON_FIELDS	Jan 13 2015
3744d6df4790	Sebastian Witowski/Tibor Simko	BibCatalog: ticket_id type is now string	Jan 13 2015
32b1e9cb7e7c	Esteban J. G. Gabancho/Tibor Simko	BibField: better create_record error catching	Jan 13 2015
5cdb435a90bd	Tibor Simko	WebSearch: new test case for pattern-limit queries	Jan 13 2015
13d3840146bd	Nikolaos Kasioumis/Tibor Simko	WebSearch: search results pattern limit fix	Jan 13 2015

Changes (44)

				Path
	M			config/invenio.conf
	M			invenio/base/static/css/invenio.css
	A			invenio/base/static/img/library_of_congress.png
	A			invenio/base/static/img/viaf.png
	A			invenio/base/static/img/wikipedia.png
	M			invenio/legacy/bibauthority/config.py
	M			invenio/legacy/bibcatalog/system.py
	M			invenio/legacy/bibcatalog/system_rt.py
	M			invenio/legacy/bibclassify/ontology_reader.py
	M			invenio/legacy/inveniocfg.py
	M			invenio/legacy/search_engine/__init__.py
	M			invenio/modules/formatter/format_elements/bfe_authority_author.py
	A			invenio/modules/formatter/format_elements/bfe_authority_author_publications.py
	M			invenio/modules/formatter/format_elements/bfe_authority_control_no.py
	M			invenio/modules/formatter/format_elements/bfe_authority_institute.py
	M			invenio/modules/formatter/format_elements/bfe_authority_journal.py
	A			invenio/modules/formatter/format_elements/bfe_authority_links.py
	A			invenio/modules/formatter/format_elements/bfe_authority_publications.py
	M			invenio/modules/formatter/format_elements/bfe_authority_subject.py
	M			invenio/modules/formatter/format_elements/bfe_authors.py
	V			{invenio/modules/formatter/format_elements ← modules/bibformat/lib/elements}/bfe_oai_identifier.py
	P			invenio/modules/formatter/format_templates/Authority_HTML_brief.bft Copied to invenio/modules/formatter/format_templates/People_HTML_brief.bft
	P			invenio/modules/formatter/format_templates/Authority_HTML_detailed.bft Copied to invenio/modules/formatter/format_templates/Subject_HTML_detailed.bft
	A			invenio/modules/formatter/format_templates/Institute_HTML_brief.bft
	A			invenio/modules/formatter/format_templates/Institute_HTML_detailed.bft
	P			invenio/modules/formatter/format_templates/People_HTML_brief.bft Copied from invenio/modules/formatter/format_templates/Authority_HTML_brief.bft
	A			invenio/modules/formatter/format_templates/People_HTML_detailed.bft
	A			invenio/modules/formatter/format_templates/Subject_HTML_brief.bft
	P			invenio/modules/formatter/format_templates/Subject_HTML_detailed.bft Copied from invenio/modules/formatter/format_templates/Authority_HTML_detailed.bft
	M			invenio/modules/formatter/output_formats/HB.bfo
	M			invenio/modules/formatter/output_formats/HD.bfo
	M			invenio/testsuite/data/demo_record_marc_data.xml
	A			invenio/utils/viaf.py
	M			modules/bibcheck/lib/bibcheck_task.py
	A			modules/bibcheck/lib/plugins/update_author_links.py
	D			modules/bibedit
	D			modules/bibedit/lib
	D			modules/bibedit/lib/ticket_templates
	D			modules/bibedit/lib/ticket_templates/Makefile.am
	D			modules/bibformat
	D			modules/bibformat/lib
	D			modules/bibformat/lib/elements
	V			{modules/bibformat/lib/elements → invenio/modules/formatter/format_elements}/bfe_oai_identifier.py
	M			modules/websearch/lib/services/JournalHintService.py

Merge branch 'master' into next4431e581423dActions

Description

Details

Event Timeline

Merged Changes

Changes (44)

R3600:4431e581423d

config/invenio.conf

invenio/base/static/css/invenio.css

invenio/base/static/img/library_of_congress.png

invenio/base/static/img/viaf.png

invenio/base/static/img/wikipedia.png

invenio/legacy/bibauthority/config.py

invenio/legacy/bibcatalog/system.py

invenio/legacy/bibcatalog/system_rt.py

invenio/legacy/bibclassify/ontology_reader.py

invenio/legacy/inveniocfg.py

invenio/legacy/search_engine/__init__.py

invenio/modules/formatter/format_elements/bfe_authority_author.py

invenio/modules/formatter/format_elements/bfe_authority_author_publications.py

invenio/modules/formatter/format_elements/bfe_authority_control_no.py

invenio/modules/formatter/format_elements/bfe_authority_institute.py

invenio/modules/formatter/format_elements/bfe_authority_journal.py

invenio/modules/formatter/format_elements/bfe_authority_links.py

invenio/modules/formatter/format_elements/bfe_authority_publications.py

invenio/modules/formatter/format_elements/bfe_authority_subject.py

invenio/modules/formatter/format_elements/bfe_authors.py

invenio/modules/formatter/format_elements/bfe_oai_identifier.py

invenio/modules/formatter/format_templates/Authority_HTML_brief.bft

invenio/modules/formatter/format_templates/Authority_HTML_detailed.bft

invenio/modules/formatter/format_templates/Institute_HTML_brief.bft

invenio/modules/formatter/format_templates/Institute_HTML_detailed.bft

invenio/modules/formatter/format_templates/People_HTML_brief.bft

invenio/modules/formatter/format_templates/People_HTML_detailed.bft

invenio/modules/formatter/format_templates/Subject_HTML_brief.bft

invenio/modules/formatter/format_templates/Subject_HTML_detailed.bft

invenio/modules/formatter/output_formats/HB.bfo

invenio/modules/formatter/output_formats/HD.bfo

invenio/testsuite/data/demo_record_marc_data.xml

invenio/utils/viaf.py

modules/bibcheck/lib/bibcheck_task.py

modules/bibcheck/lib/plugins/update_author_links.py

modules/bibedit

modules/bibedit/lib

modules/bibedit/lib/ticket_templates

modules/bibedit/lib/ticket_templates/Makefile.am

modules/bibformat

modules/bibformat/lib

modules/bibformat/lib/elements

modules/bibformat/lib/elements/bfe_oai_identifier.py

modules/websearch/lib/services/JournalHintService.py

Merge branch 'master' into next
4431e581423d
Actions

invenio/legacy/search_engine/init.py