Diffusion invenio-infoscience e6ea988342a9

Merge branch 'master' into next
e6ea988342a9
Actions

Authored by kuncar on Jun 7 2014, 16:21.

Description

Merge branch 'master' into next

Conflicts:
.travis.yml
configure-tests.py
invenio/modules/formatter/format_elements/bfe_authority_institution.py
invenio/modules/records/testsuite/fields/atlantis.cfg
modules/bibauthority/lib/bibauthority_regression_tests.py
modules/bibfield/lib/bibfield_regression_tests.py
modules/bibformat/lib/bibformat_regression_tests.py
modules/bibformat/lib/elements/Makefile.am
modules/bibformat/lib/elements/bfe_authority_institute.py
modules/bibformat/lib/elements/bfe_authority_institution.py
modules/bibupload/lib/bibupload_regression_tests.py
modules/miscutil/demo/democfgdata.sql
modules/oaiharvest/lib/oai_harvest_daemon.py
modules/webauthorprofile/lib/Makefile.am
modules/webstyle/lib/webdoc_unit_tests.py
scripts/kwalitee.py

Details

Committed

kuncar

Jun 17 2014, 09:10

Parents

R3600:730051661004: Merge branch 'maint-1.1'
R3600:2461c205a758: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:e6ea988342a9: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jun 17 2014, 09:10

Merged Changes

Commit	Author	Details	Committed
730051661004	Tibor Simko	Merge branch 'maint-1.1'	Dec 9 2013
cee324ae606b	Tibor Simko	installation: no user prompt for warnings	Dec 9 2013
5e11feffd6db	Tibor Simko	Merge branch 'maint-1.1'	Dec 5 2013
9130b1ab2a97	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Dec 5 2013
3dcd0617cefe	Tibor Simko	Merge branch 'maint-0.99' into maint-1.0	Dec 5 2013
0ce57ace5dbc	Tibor Simko	installation: empty Travis configuration	Dec 5 2013
987e0274d4ce	Tibor Simko	BibField: no caching of calculated fields	Dec 3 2013
a9786aa28381	Jerome Caffaro/Tibor Simko	WebSubmit: fix for typo in Shared_Functions	Dec 2 2013
6be1b3d522ae	Nikolaos Kasioumis/Tibor Simko	WebSearch: correct record sums from hosted colls	Dec 2 2013
c91cf86e5caa	Nikolaos Kasioumis/Tibor Simko	global: language value always in link URLs	Dec 2 2013
c3f686ed8c41	Nikolaos Kasioumis/Tibor Simko	WebSearch: space between records in MARC HTML	Dec 2 2013
1bc6af9bfde0	Esteban J. G. Gabancho/Tibor Simko	BibField: change recid field type to integer	Dec 2 2013
bb7305bce8a8	Tibor Simko	WebAuthorProfile: new regression test suite	Nov 29 2013
3e6d82f6ebfe	Tibor Simko	kwalitee: even stricter PEP-8 compliance	Nov 29 2013
e7d2b3abb530	Jerome Caffaro/Tibor Simko	OAIHarvest: sample OAI-ArXiv conversion update	Nov 29 2013
a97b64761880	Jerome Caffaro/Tibor Simko	OAIHarvest: CERN-specific "arXiv" doctype	Nov 29 2013
625326339c1d	Tibor Simko	BibAuthority: new names for authority collections	Nov 29 2013
ff0f6373d190	Tibor Simko	Merge branch 'maint-1.1'	Nov 29 2013
a6c3171f2657	Tibor Simko	I18N: collection demo names for new translations	Nov 29 2013
954b5a05a277	Tibor Simko	installation: location of jquery-1.7.1.min.js	Nov 29 2013
e903a30f6515	Tibor Simko	Merge branch 'maint-1.1'	Nov 28 2013
e14879e0e7f5	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Nov 28 2013
bf2ede26c1c5	Tibor Simko	BibUpload: FFT replace warning in guide	Nov 28 2013

Changes (30)

				Path
	M			ABOUT-NLS
	M			Makefile.am
	M			config/invenio.conf
	M			configure-tests.py
	M			invenio/legacy/bibauthority/config.py
	M			invenio/legacy/bibauthority/doc/admin/bibauthority-admin-guide.webdoc
	M			invenio/legacy/bibauthority/doc/hacking/bibauthority-internals.webdoc
	M			invenio/legacy/bibauthority/engine.py
	M			invenio/legacy/bibclassify/doc/admin/bibclassify-admin-guide.webdoc
	M			invenio/legacy/bibupload/doc/admin/bibupload-admin-guide.webdoc
	M			invenio/legacy/miscutil/sql/tabfill.sql
	M			invenio/legacy/search_engine/__init__.py
	M			invenio/legacy/webhelp/web/admin/howto/howto-authority.webdoc
	M			invenio/legacy/websearch/templates.py
	M			invenio/legacy/websearch/webcoll.py
	M			invenio/legacy/webstyle/webdoc.py
	M			invenio/legacy/websubmit/functions/Shared_Functions.py
	M			invenio/modules/converter/converterext/templates/oaiarxiv2marcxml.xsl
	M			invenio/modules/formatter/format_elements/bfe_authority_institution.py
	M			invenio/modules/formatter/format_elements/bfe_authors.py
	M			invenio/modules/formatter/format_templates/Authority_HTML_brief.bft
	M			invenio/modules/formatter/format_templates/Authority_HTML_detailed.bft
	M			invenio/modules/indexer/fixtures.py
	M			invenio/modules/records/testsuite/fields/atlantis.cfg
	M			invenio/modules/search/fixtures.py
	M			invenio/modules/search/models.py
	M			invenio/modules/search/templates/search/index_base.html
	M			invenio/testsuite/data/demo_record_marc_data.xml
	M			po/POTFILES.in
	M			scripts/kwalitee.py

Merge branch 'master' into nexte6ea988342a9Actions

Description

Details

Event Timeline

Merged Changes

Changes (30)

R3600:e6ea988342a9

ABOUT-NLS

Makefile.am

config/invenio.conf

configure-tests.py

invenio/legacy/bibauthority/config.py

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

invenio/legacy/bibauthority/doc/hacking/bibauthority-internals.webdoc

invenio/legacy/bibauthority/engine.py

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

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

invenio/legacy/miscutil/sql/tabfill.sql

invenio/legacy/search_engine/__init__.py

invenio/legacy/webhelp/web/admin/howto/howto-authority.webdoc

invenio/legacy/websearch/templates.py

invenio/legacy/websearch/webcoll.py

invenio/legacy/webstyle/webdoc.py

invenio/legacy/websubmit/functions/Shared_Functions.py

invenio/modules/converter/converterext/templates/oaiarxiv2marcxml.xsl

invenio/modules/formatter/format_elements/bfe_authority_institution.py

invenio/modules/formatter/format_elements/bfe_authors.py

invenio/modules/formatter/format_templates/Authority_HTML_brief.bft

invenio/modules/formatter/format_templates/Authority_HTML_detailed.bft

invenio/modules/indexer/fixtures.py

invenio/modules/records/testsuite/fields/atlantis.cfg

invenio/modules/search/fixtures.py

invenio/modules/search/models.py

invenio/modules/search/templates/search/index_base.html

invenio/testsuite/data/demo_record_marc_data.xml

po/POTFILES.in

scripts/kwalitee.py

Merge branch 'master' into next
e6ea988342a9
Actions

invenio/legacy/search_engine/init.py