Diffusion invenio-infoscience 297b2202cfdc

Merge branch 'master' into next
297b2202cfdc
Actions

Authored by kuncar on Jan 8 2015, 15:34.

Description

Merge branch 'master' into next

master: BibCirculation: fix for wrong non-borrower message BibDocFile: pickle support fix WebSearch: proper re-raise in RSS handling WebStat: default query in the Custom query summary WebComment: fix for get_first_comments_or_remarks WebSearch: fix for the number of printed records BibRank: fix path for download history graph BibCirculation: library creation and other fixes BibRecord: namespaces ignored for lxml RefExtract: avoid double encoding BibCheck: allow filtering by subfield contents BibDocFile: decompose_file_url() and subformat OAIRepository: lower priority to updating uploads BibFormat: ORCID display for authors mailutils: support invalid senders WebBasket: better formatting of deletion message

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

Conflicts:
invenio/base/static/css/invenio.css
invenio/ext/email/__init.py
invenio/legacy/bibcirculation/adminlib.py
invenio/legacy/bibrecord/init__.py
invenio/legacy/webbasket/templates.py
invenio/legacy/websearch/webinterface.py
invenio/legacy/webstat/webinterface.py
invenio/modules/formatter/format_elements/bfe_authors.py
modules/bibcheck/lib/bibcheck_plugins_unit_tests.py
modules/bibcheck/lib/bibcheck_unit_tests.py

Details

Committed

kuncar

Jan 8 2015, 16:35

Parents

R3600:ea17e3cb9f49: Merge branch 'maint-1.1'
R3600:1bc3fc9d061a: BibConvert: lxml support for local document()

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:297b2202cfdc: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jan 8 2015, 16:35

Merged Changes

Commit	Author	Details	Committed
ea17e3cb9f49	Tibor Simko	Merge branch 'maint-1.1'	Jan 7 2015
40b1a7cfb667	Stefan Hesselbach/Tibor Simko	BibCirculation: fix for wrong non-borrower message	Jan 7 2015
b1407854cbcd	Esteban J. G. Gabancho/Tibor Simko	BibDocFile: pickle support fix	Jan 6 2015
f7461861157d	Jan Aage Lavik/Tibor Simko	WebSearch: proper re-raise in RSS handling	Jan 6 2015
864c8ce24643	Nikolaos Kasioumis/Tibor Simko	WebStat: default query in the Custom query summary	Jan 6 2015
8b6dcc8b8522	Nikolaos Kasioumis/Tibor Simko	WebComment: fix for get_first_comments_or_remarks	Jan 6 2015
176953e5db04	Ludmila Marian/Tibor Simko	WebSearch: fix for the number of printed records	Jan 6 2015
4bd9f05784e3	Guillaume Lastecoueres/Tibor Simko	BibRank: fix path for download history graph	Jan 6 2015
2080fdb795d9	Guillaume Lastecoueres/Tibor Simko	BibCirculation: library creation and other fixes	Jan 6 2015
712ee0518475	Georgios Papoutsakis/Tibor Simko	BibRecord: namespaces ignored for lxml	Jan 6 2015
a9a2a44b10be	Jan Aage Lavik/Tibor Simko	RefExtract: avoid double encoding	Jan 6 2015
37418d443415	Dimitrios Semitsoglou-Tsiapos/Tibor Simko	BibCheck: allow filtering by subfield contents	Jan 6 2015
1039d003aa26	Samuele Kaplun/Tibor Simko	BibDocFile: decompose_file_url() and subformat	Jan 6 2015
903d435069a2	Samuele Kaplun/Tibor Simko	OAIRepository: lower priority to updating uploads	Jan 6 2015
bb4dbcdd3511	Wojciech Ziółek/Tibor Simko	BibFormat: ORCID display for authors	Jan 6 2015
8214d976dace	Daniel Lovasko/Tibor Simko	mailutils: support invalid senders	Jan 6 2015
d926c90f81a9	Tibor Simko	Merge branch 'maint-1.1'	Jan 6 2015
6ab4d77ac97e	Tibor Simko	WebBasket: better formatting of deletion message	Jan 6 2015

Changes (17)

				Path
	M			invenio/base/static/css/invenio.css
	M			invenio/ext/email/__init__.py
	M			invenio/legacy/bibcirculation/admin_webinterface.py
	M			invenio/legacy/bibcirculation/adminlib.py
	M			invenio/legacy/bibcirculation/db_layer.py
	M			invenio/legacy/bibdocfile/api.py
	M			invenio/legacy/bibrank/downloads_grapher.py
	M			invenio/legacy/bibrecord/__init__.py
	M			invenio/legacy/oairepository/updater.py
	M			invenio/legacy/refextract/linker.py
	M			invenio/legacy/search_engine/__init__.py
	M			invenio/legacy/webbasket/templates.py
	M			invenio/legacy/webcomment/templates.py
	M			invenio/legacy/websearch/webinterface.py
	M			invenio/legacy/webstat/webinterface.py
	M			invenio/modules/formatter/format_elements/bfe_authors.py
	M			modules/bibcheck/lib/bibcheck_task.py

Merge branch 'master' into next297b2202cfdcActions

Description

Details

Event Timeline

Merged Changes

Changes (17)

R3600:297b2202cfdc

invenio/base/static/css/invenio.css

invenio/ext/email/__init__.py

invenio/legacy/bibcirculation/admin_webinterface.py

invenio/legacy/bibcirculation/adminlib.py

invenio/legacy/bibcirculation/db_layer.py

invenio/legacy/bibdocfile/api.py

invenio/legacy/bibrank/downloads_grapher.py

invenio/legacy/bibrecord/__init__.py

invenio/legacy/oairepository/updater.py

invenio/legacy/refextract/linker.py

invenio/legacy/search_engine/__init__.py

invenio/legacy/webbasket/templates.py

invenio/legacy/webcomment/templates.py

invenio/legacy/websearch/webinterface.py

invenio/legacy/webstat/webinterface.py

invenio/modules/formatter/format_elements/bfe_authors.py

modules/bibcheck/lib/bibcheck_task.py

Merge branch 'master' into next
297b2202cfdc
Actions

invenio/ext/email/init.py

invenio/legacy/bibrecord/init.py

invenio/legacy/search_engine/init.py