Homec4science

Merge branch 'master' into next

Authored by kuncar on Jun 23 2014, 15:35.

Description

Merge branch 'master' into next

Conflicts:
.gitignore
.travis.yml
INSTALL
Makefile.am
config/invenio.conf
configure.ac
invenio/ext/email/__init.py
invenio/ext/legacy/layout.py
invenio/legacy/batchuploader/cli.py
invenio/legacy/batchuploader/engine.py
invenio/legacy/bibauthorid/backinterface.py
invenio/legacy/bibauthorid/cli.py
invenio/legacy/bibauthorid/cluster_set.py
invenio/legacy/bibauthorid/comparison.py
invenio/legacy/bibauthorid/daemon.py
invenio/legacy/bibauthorid/dbinterface.py
invenio/legacy/bibauthorid/frontinterface.py
invenio/legacy/bibauthorid/merge.py
invenio/legacy/bibauthorid/name_utils.py
invenio/legacy/bibauthorid/personid_maintenance.py
invenio/legacy/bibauthorid/prob_matrix.py
invenio/legacy/bibauthorid/rabbit.py
invenio/legacy/bibauthorid/recipes.py
invenio/legacy/bibauthorid/scripts/bibauthorid.py
invenio/legacy/bibauthorid/searchinterface.py
invenio/legacy/bibauthorid/templates.py
invenio/legacy/bibauthorid/tortoise.py
invenio/legacy/bibauthorid/webapi.py
invenio/legacy/bibauthorid/webinterface.py
invenio/legacy/bibauthorid/wedge.py
invenio/legacy/bibcatalog/api.py
invenio/legacy/bibcatalog/doc/hacking/hacking/bibcatalog-api.webdoc
invenio/legacy/bibcatalog/system_email.py
invenio/legacy/bibcatalog/system_rt.py
invenio/legacy/bibcatalog/templates.py
invenio/legacy/bibcheck/doc/admin/bibcheck-admin-guide.webdoc
invenio/legacy/bibcheck/sample.cfg
invenio/legacy/bibcheck/web/admin/bibcheckadmin.py
invenio/legacy/bibclassify/daemon.py
invenio/legacy/bibclassify/engine.py
invenio/legacy/bibclassify/ontology_reader.py
invenio/legacy/bibdocfile/api.py
invenio/legacy/bibdocfile/cli.py
invenio/legacy/bibdocfile/webinterface.py
invenio/legacy/bibedit/db_layer.py
invenio/legacy/bibedit/engine.py
invenio/legacy/bibedit/templates.py
invenio/legacy/bibedit/utils.py
invenio/legacy/bibedit/webinterface.py
invenio/legacy/bibeditmulti/templates.py
invenio/legacy/bibexport/sitemap.py
invenio/legacy/bibformat/bibreformat.py
invenio/legacy/bibformat/templates.py
invenio/legacy/bibformat/web/admin/bibformatadmin.py
invenio/legacy/bibindex/engine.py
invenio/legacy/bibmatch/engine.py
invenio/legacy/bibmatch/validator.py
invenio/legacy/bibmerge/engine.py
invenio/legacy/bibmerge/webinterface.py
invenio/legacy/bibrank/citation_grapher.py
invenio/legacy/bibrank/citation_indexer.py
invenio/legacy/bibrank/citation_searcher.py
invenio/legacy/bibrank/citerank_indexer.py
invenio/legacy/bibrank/cli.py
invenio/legacy/bibrank/downloads_grapher.py
invenio/legacy/bibrank/grapher.py
invenio/legacy/bibrank/record_sorter.py
invenio/legacy/bibrank/selfcites_indexer.py
invenio/legacy/bibrank/selfcites_task.py
invenio/legacy/bibrank/tag_based_indexer.py
invenio/legacy/bibrank/word_searcher.py
invenio/legacy/bibrecord/
init.py
invenio/legacy/bibsched/bibtask.py
invenio/legacy/bibsched/cli.py
invenio/legacy/bibsched/webapi.py
invenio/legacy/bibsched/webinterface.py
invenio/legacy/bibupload/engine.py
invenio/legacy/dbquery.py
invenio/legacy/docextract/webinterface.py
invenio/legacy/external_authentication/oauth2.py
invenio/legacy/inveniocfg.py
invenio/legacy/miscutil/dbdump.py
invenio/legacy/miscutil/sql/tabdrop.sql
invenio/legacy/miscutil/sql/tabfill.sql
invenio/legacy/oaiharvest/admin.py
invenio/legacy/oaiharvest/dblayer.py
invenio/legacy/oaiharvest/web/admin/oai_harvest_admin.js
invenio/legacy/oaiharvest/web/admin/oaiharvestadmin.py
invenio/legacy/oairepository/server.py
invenio/legacy/oairepository/updater.py
invenio/legacy/refextract/api.py
invenio/legacy/refextract/cli.py
invenio/legacy/refextract/engine.py
invenio/legacy/refextract/kbs.py
invenio/legacy/refextract/linker.py
invenio/legacy/refextract/tag.py
invenio/legacy/refextract/task.py
invenio/legacy/refextract/xml.py
invenio/legacy/search_engine/
init.py
invenio/legacy/search_engine/query_parser.py
invenio/legacy/search_engine/summarizer.py
invenio/legacy/webauthorprofile/corefunctions.py
invenio/legacy/webauthorprofile/daemon.py
invenio/legacy/webauthorprofile/dbapi.py
invenio/legacy/webauthorprofile/interface.py
invenio/legacy/webauthorprofile/templates.py
invenio/legacy/webauthorprofile/webinterface.py
invenio/legacy/webbasket/errors.py
invenio/legacy/webjournal/api.py
invenio/legacy/websearch/adminlib.py
invenio/legacy/websearch/templates.py
invenio/legacy/websession/inveniogc.py
invenio/legacy/webstat/engine.py
invenio/legacy/webstyle/templates.py
invenio/legacy/webstyle/webdoc.py
invenio/legacy/websubmit/inveniounoconv.py
invenio/legacy/websubmit/templates.py
invenio/legacy/webuser.py
invenio/legacy/wsgi/
init.py
invenio/modules/access/local_config.py
invenio/modules/classifier/testsuite/test_classifier.py
invenio/modules/formatter/engine.py
invenio/modules/formatter/engines/xslt.py
invenio/modules/formatter/format_elements/bfe_aid_authors.py
invenio/modules/formatter/format_elements/bfe_authors.py
invenio/modules/formatter/format_elements/bfe_bookmark.py
invenio/modules/formatter/format_elements/bfe_copyright.py
invenio/modules/formatter/format_elements/bfe_edit_files.py
invenio/modules/formatter/format_elements/bfe_edit_record.py
invenio/modules/formatter/format_elements/bfe_editors.py
invenio/modules/formatter/format_elements/bfe_fulltext.py
invenio/modules/formatter/format_elements/bfe_fulltext_mini.py
invenio/modules/formatter/format_elements/bfe_keywords.py
invenio/modules/formatter/format_elements/bfe_meta.py
invenio/modules/formatter/format_elements/bfe_photo_resources_brief.py
invenio/modules/formatter/format_elements/bfe_photos.py
invenio/modules/formatter/format_elements/bfe_plots.py
invenio/modules/formatter/format_elements/bfe_plots_thumb.py
invenio/modules/formatter/format_elements/bfe_references.py
invenio/modules/formatter/format_elements/bfe_sciencewise.py
invenio/modules/formatter/format_elements/bfe_sword_push.py
invenio/modules/formatter/format_elements/bfe_video_platform_suggestions.py
invenio/modules/formatter/format_elements/bfe_webauthorpage_affiliations.py
invenio/modules/formatter/testsuite/test_formatter_engine.py
invenio/modules/formatter/utils.py
invenio/modules/indexer/tokenizers/BibIndexFulltextTokenizer.py
invenio/modules/matcher/testsuite/test_matcher.py
invenio/modules/pages/templates/pages/default_base.html
invenio/modules/search/testsuite/test_search_engine_query_parser.py
invenio/modules/search/testsuite/test_search_external_collections_getter.py
invenio/modules/search/testsuite/test_views.py
invenio/modules/textminer/testsuite/test_textminer_references.py
invenio/testsuite/test_emergency_recipients.py
invenio/testsuite/test_plotextractor.py
invenio/testsuite/test_utils_date.py
invenio/testsuite/test_utils_text.py
invenio/testsuite/test_utils_url.py
invenio/utils/crossref.py
invenio/utils/date.py
invenio/utils/plotextractor/cli.py
invenio/utils/plotextractor/getter.py
invenio/utils/plotextractor/output_utils.py
invenio/utils/plotextractor/plotextractor_dummy.png
invenio/utils/shell.py
modules/Makefile.am
modules/bibauthorid/lib/Makefile.am
modules/bibauthorid/lib/bibauthorid_webauthorprofileinterface.py
modules/bibcatalog/Makefile.am
modules/bibcatalog/bin/Makefile.am
modules/bibcatalog/doc/admin/Makefile.am
modules/bibcatalog/lib/Makefile.am
modules/bibcheck/Makefile.am
modules/bibcheck/bin/Makefile.am
modules/bibcheck/doc/Makefile.am
modules/bibcheck/etc/Makefile.am
modules/bibcirculation/lib/Makefile.am
modules/bibedit/lib/Makefile.am
modules/bibedit/lib/bibedit_web_tests.py
modules/bibedit/web/Makefile.am
modules/bibformat/etc/format_templates/Makefile.am
modules/bibformat/etc/output_formats/HD.bfo
modules/bibformat/etc/output_formats/Makefile.am
modules/bibformat/lib/bibformat.py
modules/bibformat/lib/bibformat_dblayer.py
modules/bibformat/lib/bibformat_regression_tests.py
modules/bibformat/lib/bibformat_web_tests.py
modules/bibformat/lib/elements/Makefile.am
modules/bibindex/lib/bibindex_regression_tests.py
modules/bibindex/lib/bibindexadmin_regression_tests.py
modules/bibmatch/lib/bibmatch_regression_tests.py
modules/bibrank/lib/Makefile.am
modules/bibrank/lib/bibrank_citation_indexer_regression_tests.py
modules/bibrank/lib/bibrank_regression_tests.py
modules/bibrank/lib/bibrank_selfcites_regression_tests.py
modules/bibupload/lib/batchuploader_regression_tests.py
modules/bibupload/lib/bibupload_regression_tests.py
modules/bibupload/lib/bibupload_revisionverifier_regression_tests.py
modules/docextract/bin/Makefile.am
modules/docextract/lib/Makefile.am
modules/docextract/lib/docextract_webinterface_unit_tests.py
modules/docextract/lib/refextract_api_regression_tests.py
modules/docextract/lib/refextract_regression_tests.py
modules/miscutil/bin/Makefile.am
modules/miscutil/lib/Makefile.am
modules/miscutil/lib/
init__.py
modules/miscutil/lib/errorlib.py
modules/miscutil/lib/intbitset.c
modules/miscutil/lib/intbitset.pyx
modules/miscutil/lib/invenio_connector_regression_tests.py
modules/miscutil/lib/inveniocfg_upgrader.py
modules/miscutil/lib/inveniocfg_upgrader_unit_tests.py
modules/miscutil/lib/plotextractor_regression_tests.py
modules/miscutil/lib/sequtils_regression_tests.py
modules/miscutil/lib/testutils.py
modules/miscutil/lib/testutils_regression_tests.py
modules/oaiharvest/lib/Makefile.am
modules/oaiharvest/lib/oai_harvest_daemon.py
modules/oaiharvest/lib/oai_harvest_web_tests.py
modules/oaiharvest/web/admin/Makefile.am
modules/oairepository/lib/oai_repository_regression_tests.py
modules/pdfchecker/bin/Makefile.am
modules/webalert/lib/webalert_regression_tests.py
modules/webauthorprofile/lib/Makefile.am
modules/webauthorprofile/lib/webauthorprofile_regression_tests.py
modules/webjournal/etc/AtlantisTimes_Detailed.bft
modules/websearch/lib/Makefile.am
modules/websearch/lib/search_engine_utils.py
modules/websearch/lib/websearch_regression_tests.py
modules/webstyle/img/Makefile.am
modules/webstyle/lib/Makefile.am
modules/webstyle/lib/invenio.wsgi
requirements-extras.txt
requirements.txt

Details

Committed
kuncarJun 23 2014, 15:35
Parents
R3600:4b1d324f3059: Merge branch 'maint-1.1'
R3600:e6ea988342a9: Merge branch 'master' into next
Branches
Unknown
Tags
Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:96d4e02c9c87: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jun 23 2014, 15:35

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
4b1d324f3059Tibor Simko
Merge branch 'maint-1.1' 
Jan 19 2014
13b3a916ad12Tibor Simko
BibAuthorID: inactivation of test_save_matrix() 
Jan 19 2014
0c5636543868Tibor Simko
installation: jinja2 prerequisite 
Jan 19 2014
8da8eed2eaa4Samuele Kaplun
BibUpload: removed print statement 
Jan 17 2014
2ababc349a59Jan Aage Lavik/Samuele Kaplun
BibUpload: do not always process MoreInfo 
Jan 17 2014
99c15a3970daJan Aage Lavik/Samuele Kaplun
BibDocFile: fix "delete" CLI option 
Jan 17 2014
02ebed45bd24Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Jan 17 2014
19e8fc2a6c44Tibor Simko
BatchUploader: rights to ::1 for robot upload 
Jan 17 2014
5b6225743b2fTibor Simko
Travis CI: initial release of configuration 
Jan 17 2014
d9150706b465Tibor Simko
installation: pip requirements 
Jan 17 2014
75840f814508Tibor Simko
installation: move h5py to extra requirements 
Jan 16 2014
856f73ec1059Tibor Simko
installation: h5py requirement clean-up 
Jan 15 2014
78daa5f125dfJavier Martin Montull/Samuele Kaplun
BibEdit: fix revert when no 005 in history 
Jan 13 2014
daf0b7cdaf3dAlessio Deiana/Samuele Kaplun
WebSearch: reverse order and scores 
Jan 13 2014
cfbbb0a27d1aTibor Simko
Merge branch 'sam/inspire-prod-for-invenio-master' 
Jan 9 2014
a0f655096af0Samuele Kaplun
dbdump: partial dumps 
Jan 8 2014
a9af62e7296fSamuele Kaplun
BibUpload: CFG_BIBUPLOAD_EXTERNAL_OAIID_TAG fix 
Jan 8 2014
89dcdbd6aac4Samuele Kaplun
BibCheck: last_run correct update 
Jan 8 2014
2ea2c5428d17Samuele Kaplun
BatchUploader: apache error codes 
Jan 8 2014
a2c566da417fSamuele Kaplun
BibUpload: new CFG_BIBUPLOAD_MATCH_DELETED_RECORDS 
Jan 8 2014
3dbeeb75230bSamuele Kaplun
BatchUploader: insert or replace mode 
Jan 8 2014
10f1434c80a6Samuele Kaplun
BatchUploader: authorize via CIDR 
Jan 8 2014
4a61106c99e8Samuele Carli/Samuele Kaplun
BibAuthorID: merge and manage fixes 
Jan 8 2014
4f2d40e815f2Alessio Deiana/Samuele Kaplun
DocExtract: additional report numbers 
Jan 8 2014
880314f705eaSamuele Kaplun
BibCheck: properly cumulates records 
Jan 8 2014
4a629c873020Samuele Kaplun
BibUpload: affected fields and insert mode 
Jan 8 2014
3644f12a9a0aAlessio Deiana/Samuele Kaplun
BibSched: pep8 for bibtask.py 
Jan 8 2014
ec8e6105b79cAlessio Deiana/Samuele Kaplun
BibSched: pep8 for bibched.py 
Jan 8 2014
bd5825b1c461Alessio Deiana/Samuele Kaplun
BibAuthorID: caches badly stored in user settings 
Jan 8 2014
cd183cd48c47Alessio Deiana/Samuele Kaplun
WebAuthorProfile: reenable profile pages 
Jan 8 2014
4e785cb1c320Alessio Deiana/Samuele Kaplun
WebSearch: rg parameter with of='id' 
Jan 8 2014
21c4b601ccf8Alessio Deiana/Samuele Kaplun
BibSched: subdirs for bibsched logs 
Jan 8 2014
b3d57df6e4f7Alessio Deiana/Samuele Kaplun
BibRank: adds a new option to disable bibsort 
Jan 8 2014
e31f37e1ce30Alessio Deiana/Samuele Kaplun
WebSearch: reworks async downloader 
Jan 8 2014
4d72c7513f7aJavier Martin Montull/Samuele Kaplun
sequtils: no texkey if no year 
Jan 8 2014
30a2356afe14Alessio Deiana/Samuele Kaplun
WebSearch: wgsi.errors in fake request 
Jan 8 2014
107ae63a6d9dJan Aage Lavik/Samuele Kaplun
BibCatalog: improve RT search error handling 
Jan 8 2014
c37c00fbcb7cGraham R. Armstrong/Samuele Kaplun
DocExtract: extract page-end from references 
Jan 8 2014
ea5f8e5930bdAlessio Deiana/Samuele Kaplun
BibClassify: always use invenio code 
Jan 8 2014
be225ed2774dSamuele Carli/Samuele Kaplun
BibAuthorID: fix 'create new person' ticketing issue 
Jan 8 2014
bbaa5983d7c4Alessio Deiana/Samuele Kaplun
WebAuthorProfile: disable if not available 
Jan 8 2014
02b6075261f1Alessio Deiana/Samuele Kaplun
sequtils: increases size of seqSTORE.seq_value 
Jan 8 2014
792cafc69467Alessio Deiana/Samuele Kaplun
testutils: default to assertEqual in py26 
Jan 8 2014
fc65bbcef753Alessio Deiana/Samuele Kaplun
filedownloadutils: add verbose to download_url() 
Jan 8 2014
86b60776d4c1Alessio Deiana/Samuele Kaplun
DocExtract: removes stdout ouput from tests 
Jan 8 2014
db6f1c1b4f9fAlessio Deiana/Samuele Kaplun
RefExtract: addresses warning in tests 
Jan 8 2014
918a6d8b3772Alessio Deiana/Samuele Kaplun
WebStyle: silence client disconnected errors 
Jan 8 2014
9d291b17ee57Alessio Deiana/Samuele Kaplun
BibRank: minor refactoring in word ranking 
Jan 8 2014
2020ac2d5734Alessio Deiana/Samuele Kaplun
DocExtract: rework of regression tests 
Jan 8 2014
3a51aa79cabfAlessio Deiana/Samuele Kaplun
OAIRepository: do not report cache not found errors 
Jan 8 2014