Homec4science

Merge branch 'master' into next

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
kuncarJun 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

CommitAuthorDetailsCommitted
730051661004Tibor Simko
Merge branch 'maint-1.1' 
Dec 9 2013
cee324ae606bTibor Simko
installation: no user prompt for warnings 
Dec 9 2013
5e11feffd6dbTibor Simko
Merge branch 'maint-1.1' 
Dec 5 2013
9130b1ab2a97Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Dec 5 2013
3dcd0617cefeTibor Simko
Merge branch 'maint-0.99' into maint-1.0 
Dec 5 2013
0ce57ace5dbcTibor Simko
installation: empty Travis configuration 
Dec 5 2013
987e0274d4ceTibor Simko
BibField: no caching of calculated fields 
Dec 3 2013
a9786aa28381Jerome Caffaro/Tibor Simko
WebSubmit: fix for typo in Shared_Functions 
Dec 2 2013
6be1b3d522aeNikolaos Kasioumis/Tibor Simko
WebSearch: correct record sums from hosted colls 
Dec 2 2013
c91cf86e5caaNikolaos Kasioumis/Tibor Simko
global: language value always in link URLs 
Dec 2 2013
c3f686ed8c41Nikolaos Kasioumis/Tibor Simko
WebSearch: space between records in MARC HTML 
Dec 2 2013
1bc6af9bfde0Esteban J. G. Gabancho/Tibor Simko
BibField: change recid field type to integer 
Dec 2 2013
bb7305bce8a8Tibor Simko
WebAuthorProfile: new regression test suite 
Nov 29 2013
3e6d82f6ebfeTibor Simko
kwalitee: even stricter PEP-8 compliance 
Nov 29 2013
e7d2b3abb530Jerome Caffaro/Tibor Simko
OAIHarvest: sample OAI-ArXiv conversion update 
Nov 29 2013
a97b64761880Jerome Caffaro/Tibor Simko
OAIHarvest: CERN-specific "arXiv" doctype 
Nov 29 2013
625326339c1dTibor Simko
BibAuthority: new names for authority collections 
Nov 29 2013
ff0f6373d190Tibor Simko
Merge branch 'maint-1.1' 
Nov 29 2013
a6c3171f2657Tibor Simko
I18N: collection demo names for new translations 
Nov 29 2013
954b5a05a277Tibor Simko
installation: location of jquery-1.7.1.min.js 
Nov 29 2013
e903a30f6515Tibor Simko
Merge branch 'maint-1.1' 
Nov 28 2013
e14879e0e7f5Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Nov 28 2013
bf2ede26c1c5Tibor Simko
BibUpload: FFT replace warning in guide 
Nov 28 2013