Diffusion invenio-infoscience aa232da412f9

Merge branch 'master' into next
aa232da412f9
Actions

Authored by kuncar on Jan 6 2015, 10:12.

Description

Merge branch 'master' into next

master: OAIRepository: fix for hidden OAI tags WebAccess: automatically fetch SSO nicknames WebComment: more prominent subscription link BibConvert: lxml support for local document() plotextractor: recid parsing fix BibKnowledge: searchtype parameter in KB export BibFormat: removal of obsolete BFX engine BibMerge: adds CFG_SITE_RECORD as script data BibUpload: faster recjson deletion after updates

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

Conflicts:
INSTALL
invenio/legacy/bibconvert/bfx_engine.py
invenio/legacy/bibmerge/engine.py
invenio/legacy/external_authentication/sso.py
invenio/modules/access/local_config.py
invenio/modules/converter/converterext/templates/oaidc2marcxml.bfx
invenio/modules/formatter/engines/bfx.py
invenio/modules/formatter/engines/bfx_config.py
invenio/modules/formatter/format_elements/bfe_bfx_engine.py
modules/bibconvert/bin/bibconvert.in
modules/bibconvert/etc/Makefile.am
modules/bibconvert/lib/Makefile.am
modules/bibconvert/lib/bibconvert_xslt_engine.py
modules/bibformat/lib/Makefile.am
modules/bibformat/lib/elements/Makefile.am
modules/bibknowledge/lib/bibknowledge_webinterface.py

Details

Committed

kuncar

Jan 6 2015, 10:12

Parents

R3600:eec1f938d724: OAIRepository: fix for hidden OAI tags
R3600:4898619e6d42: assets: bower command --output-file option

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:aa232da412f9: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jan 6 2015, 10:12

Merged Changes

Commit	Author	Details	Committed
eec1f938d724	Wojciech Ziolek/Tibor Simko	OAIRepository: fix for hidden OAI tags	Jan 5 2015
37e761f07fed	Harris Tzovanakis/Tibor Simko	WebAccess: automatically fetch SSO nicknames	Jan 5 2015
0c6c4cebe244	Avraam Tsantekidis/Tibor Simko	WebComment: more prominent subscription link	Jan 5 2015
0f99378ea376	Jan Aage Lavik/Tibor Simko	BibConvert: lxml support for local document()	Jan 5 2015
eb0ddcdf59de	Jan Aage Lavik/Tibor Simko	plotextractor: recid parsing fix	Jan 5 2015
eac2b3ce46cd	Pedro Gaudencio/Tibor Simko	BibKnowledge: searchtype parameter in KB export	Jan 5 2015
cc5bcab5b331	Tibor Simko	BibFormat: removal of obsolete BFX engine	Jan 5 2015
44ba77ec589c	Øystein Blixhavn/Tibor Simko	BibMerge: adds CFG_SITE_RECORD as script data	Jan 5 2015
7782edca189c	Tibor Simko	BibUpload: faster recjson deletion after updates	Jan 5 2015

Changes (15)

				Path
	M			config/invenio.conf
	M			invenio/base/config.py
	D			invenio/legacy/bibconvert/bfx_engine.py
	M			invenio/legacy/bibconvert/doc/admin/bibconvert-admin-guide.webdoc
	M			invenio/legacy/bibmerge/engine.py
	M			invenio/legacy/external_authentication/sso.py
	M			invenio/legacy/oairepository/server.py
	M			invenio/legacy/webcomment/templates.py
	M			invenio/modules/access/local_config.py
	D			invenio/modules/converter/converterext/templates/oaidc2marcxml.bfx
	D			invenio/modules/formatter/engines/bfx.py
	D			invenio/modules/formatter/engines/bfx_config.py
	D			invenio/modules/formatter/format_elements/bfe_bfx_engine.py
	M			invenio/utils/plotextractor/getter.py
	M			po/POTFILES.in

Merge branch 'master' into nextaa232da412f9Actions

Description

Details

Event Timeline

Merged Changes

Changes (15)

R3600:aa232da412f9

config/invenio.conf

invenio/base/config.py

invenio/legacy/bibconvert/bfx_engine.py

invenio/legacy/bibconvert/doc/admin/bibconvert-admin-guide.webdoc

invenio/legacy/bibmerge/engine.py

invenio/legacy/external_authentication/sso.py

invenio/legacy/oairepository/server.py

invenio/legacy/webcomment/templates.py

invenio/modules/access/local_config.py

invenio/modules/converter/converterext/templates/oaidc2marcxml.bfx

invenio/modules/formatter/engines/bfx.py

invenio/modules/formatter/engines/bfx_config.py

invenio/modules/formatter/format_elements/bfe_bfx_engine.py

invenio/utils/plotextractor/getter.py

po/POTFILES.in

Merge branch 'master' into next
aa232da412f9
Actions