Diffusion invenio-infoscience e3a98eb3aa25

Merge branch 'master' into next
e3a98eb3aa25
Actions

Authored by kuncar on Jun 23 2014, 18:22.

Description

Merge branch 'master' into next

Conflicts:
.gitignore
INSTALL
config/invenio.conf
invenio/ext/legacy/handler.py
invenio/legacy/bibdocfile/api.py
invenio/legacy/bibdocfile/managedocfiles.py
invenio/legacy/bibdocfile/plugins/bom_textdoc.py
invenio/legacy/bibdocfile/webinterface.py
invenio/legacy/bibexport/googlescholar.py
invenio/legacy/bibexport/sitemap.py
invenio/legacy/bibindex/adminlib.py
invenio/legacy/bibindex/engine.py
invenio/legacy/bibrank/citation_indexer.py
invenio/legacy/bibrank/citation_searcher.py
invenio/legacy/bibrank/selfcites_task.py
invenio/legacy/bibrecord/__init.py
invenio/legacy/bibupload/engine.py
invenio/legacy/inveniocfg.py
invenio/legacy/miscutil/sql/tabfill.sql
invenio/legacy/refextract/linker.py
invenio/legacy/search_engine/init.py
invenio/legacy/webcomment/templates.py
invenio/legacy/websearch/webcoll.py
invenio/legacy/websession/session.py
invenio/legacy/webstat/api.py
invenio/legacy/webstyle/templates.py
invenio/legacy/websubmit/file_stamper.py
invenio/legacy/websubmit/functions/Create_Modify_Interface.py
invenio/legacy/websubmit/functions/Create_Upload_Files_Interface.py
invenio/legacy/websubmit/functions/Link_Records.py
invenio/legacy/websubmit/functions/Shared_Functions.py
invenio/modules/access/engine.py
invenio/modules/access/local_config.py
invenio/modules/comments/api.py
invenio/modules/formatter/format_elements/bfe_authors.py
invenio/modules/indexer/tokenizers/BibIndexAuthorCountTokenizer.py
invenio/modules/indexer/tokenizers/BibIndexDefaultTokenizer.py
invenio/modules/indexer/tokenizers/BibIndexEmptyTokenizer.py
invenio/modules/indexer/tokenizers/BibIndexFiletypeTokenizer.py
invenio/modules/indexer/tokenizers/BibIndexItemCountTokenizer.py
invenio/modules/indexer/tokenizers/BibIndexJournalTokenizer.py
invenio/modules/records/testsuite/fields/atlantis.cfg
invenio/modules/records/testsuite/test_record.py
invenio/modules/redirector/redirect_methods/goto_plugin_cern_hr_documents.py
invenio/testsuite/test_utils_text.py
invenio/utils/autodiscovery/init__.py
invenio/utils/crossref.py
invenio/utils/html.py
modules/bibfield/lib/Makefile.am
modules/bibfield/lib/bibfield.py
modules/bibfield/lib/bibfield_config_engine.py
modules/bibfield/lib/bibfield_config_engine_unit_tests.py
modules/bibfield/lib/bibfield_jsonreader.py
modules/bibfield/lib/bibfield_marcreader.py
modules/bibfield/lib/bibfield_regression_tests.py
modules/bibfield/lib/bibfield_utils.py
modules/bibfield/lib/bibfield_utils_unit_tests.py
modules/bibfield/lib/functions/get_persistent_identifiers_keys.py
modules/bibfield/lib/functions/produce_json_for_marc.py
modules/bibformat/lib/elements/Makefile.am
modules/bibindex/lib/bibindex_regression_tests.py
modules/bibrank/lib/bibrank_regression_tests.py
modules/bibsched/lib/tasklets/Makefile.am
modules/bibupload/lib/bibupload_regression_tests.py
modules/docextract/lib/Makefile.am
modules/docextract/lib/docextract_regression_tests.py
modules/docextract/lib/refextract_regression_tests.py
modules/miscutil/lib/Makefile.am
modules/miscutil/lib/errorlib.py
modules/miscutil/lib/intbitset.c
modules/miscutil/lib/intbitset.pyx
modules/miscutil/lib/intbitset_unit_tests.py
modules/oairepository/lib/oai_repository_regression_tests.py
modules/webauthorprofile/lib/Makefile.am
modules/websearch/lib/Makefile.am
modules/websearch/lib/websearch_regression_tests.py
modules/websession/lib/websession_regression_tests.py
requirements-extras.txt
requirements.txt

Details

Committed

kuncar

Jun 23 2014, 18:29

Parents

R3600:bfedeb097ee9: Merge branch 'maint-1.1'
R3600:96d4e02c9c87: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:e3a98eb3aa25: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jun 23 2014, 18:29

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
bfedeb097ee9	Tibor Simko	Merge branch 'maint-1.1'	May 21 2014
6ee52a896339	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	May 21 2014
09c210d81bed	Tibor Simko	installation: GnuPG key server location update	May 21 2014
9eb20f433d72	Tibor Simko	installation: README.rst with build status badges	May 21 2014
957d47175940	Fredrik Nygård Carlsen	errorlib: support for Sentry logging	May 15 2014
881d54b2964d	Tibor Simko	WebSearch: initial support for recjson output	May 5 2014
834862532e03	Tibor Simko	I18N: fix wrong msgids in Persian translation	Apr 25 2014
2f216e0a2772	Tibor Simko	WebSearch: fix detailed record page tab tracebacks	Apr 25 2014
aff3cb92a9ba	Mehdi Zahedi/Tibor Simko	I18N: updates to the Persian translation	Apr 17 2014
25d64a55bc9e	Petros Ioannidis/Tibor Simko	WebSession: disable ORCID login	Apr 17 2014
391be32e0c18	Nikolaos Kasioumis/Tibor Simko	WebSession: Python-2.4 combatibility issue fix	Apr 17 2014
70f1dc609105	Nikolaos Kasioumis/Tibor Simko	WebSubmit: file stamper option to copy metadata	Apr 17 2014
db9f02ddb710	Samuele Kaplun	OAIHarvest: respect hidden fields	Apr 9 2014
4130ae882093	Samuele Kaplun	intbitset: initialization from iterator	Apr 8 2014
6cfac47dfe32	Esteban J. G. Gabancho/Tibor Simko	BibField: backported improvements from pu	Apr 3 2014
9b7e4b9be88e	Tibor Simko	Merge branch 'maint-1.1'	Mar 26 2014
fe1388813b6d	Jerome Caffaro/Tibor Simko	BibEncode: fix video-encoded files synchro to DB	Mar 26 2014
87e5c75aa170	Tibor Simko	Merge branch 'maint-1.1'	Mar 24 2014
2402e12a01c5	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Mar 24 2014
5511a66e5c26	Tibor Simko	installation: location of jquery.treeview	Mar 24 2014
9280cd6a038e	Tibor Simko	Merge branch 'maint-1.1'	Mar 19 2014
763968ff224e	Tibor Simko	NEWS: fix v1.1.3 version number	Mar 19 2014
3ec80203a6af	Tibor Simko	BibFormat: fix for eval_format_element return type	Mar 18 2014
75d1cd62303a	Grzegorz Szpura/Tibor Simko	bibindex: new filename index	Mar 14 2014
d6ff04729860	Grzegorz Szpura/Tibor Simko	BibIndex: changes in WordTable argument list	Mar 14 2014
a53a531893f9	Grzegorz Szpura/Tibor Simko	BibIndex: PEP8 compliance fixes	Mar 14 2014
d435254bcebe	Tibor Simko	Merge branch 'maint-1.1'	Mar 13 2014
40c208ec8b69	Jerome Caffaro/Tibor Simko	BibDocFile: convert files and icons asynchronously	Mar 13 2014
bdfaee38efd3	Jerome Caffaro/Tibor Simko	BibSched: more customizable icon creation tasklet	Mar 13 2014
0b71fe56a132	Ludmila Marian/Tibor Simko	BibSched: icons creation tasklet	Mar 13 2014
00cb24d5f34b	Tibor Simko	Merge branch 'maint-1.1'	Mar 13 2014
8afd09a64c95	Jerome Caffaro/Tibor Simko	WebSubmit: new Create_Modify_Interface parameters	Mar 13 2014
d3fbc25bb5cb	Jerome Caffaro/Tibor Simko	WebSubmit: value escaping for modifications	Mar 13 2014
a3c8103de88a	Jerome Caffaro/Tibor Simko	WebSubmit: better value escaping	Mar 13 2014
e53e80432cc3	Grzegorz Szpura/Tibor Simko	BibIndex: fix for virtual index filtering	Mar 13 2014
63602526b397	Grzegorz Szpura/Tibor Simko	WebStat: list link fix for system health UI page	Mar 6 2014
275f3695b9c9	Grzegorz Szpura/Tibor Simko	BibIndex: new DOI index	Mar 6 2014
d071120788ec	Grzegorz Szpura/Tibor Simko	BibIndex: virtual index queue dupe optimisation	Mar 6 2014
522828b91c24	Grzegorz Szpura/Tibor Simko	BibIndex: new 'all-virtual' CLI option	Mar 6 2014
32e36adc0b9d	Grzegorz Szpura/Tibor Simko	BibIndex: minor engine refactoring	Mar 6 2014
ed2b196989f5	Jerome Caffaro/Tibor Simko	WebSearch: update collection page markup	Mar 5 2014
9f278668ddaa	Jerome Caffaro/Tibor Simko	WebComment: deleted record message	Mar 5 2014
f5fc3efa88a0	Jerome Caffaro/Tibor Simko	WebSearch: fix search URL in timeout message	Mar 5 2014
7b6bdfdf31da	Jerome Caffaro/Tibor Simko	WebAccess: CERN-specific authorization message	Mar 5 2014
4b4dd8d6dddc	Jerome Caffaro/Tibor Simko	WebSearch: CERN-specific collection sorting	Mar 5 2014
c682c1e0488d	Tibor Simko	Merge branch 'maint-1.1'	Mar 5 2014
fd1e8dca60c2	Jerome Caffaro/Tibor Simko	WebComment: attachments in multi-node setup	Mar 5 2014
a8a63febc324	Jerome Caffaro/Tibor Simko	WebSearch: disable meta tags for deleted records	Mar 5 2014
91454e3e2c30	Jerome Caffaro/Tibor Simko	BibExport: update Google Scholar exporter	Mar 4 2014
f00c51ea98e8	Tibor Simko	Merge branch 'maint-1.1'	Mar 4 2014

Changes (135)

				Path
	M			.gitignore
	M			AUTHORS
	M			Makefile.am
	M			NEWS
	M			README
	A			README.rst
	M			RELEASE-NOTES
	M			UNINSTALL
	M			config/invenio.conf
	M			invenio/base/static/css/invenio.css
	M			invenio/base/static/js/ckeditor/journal-editor-styles.js
	M			invenio/ext/legacy/handler.py
	M			invenio/legacy/bibauthorid/webinterface.py
	M			invenio/legacy/bibcatalog/system_rt.py
	M			invenio/legacy/bibdocfile/api.py
	M			invenio/legacy/bibdocfile/managedocfiles.py
	M			invenio/legacy/bibdocfile/plugins/bom_textdoc.py
	M			invenio/legacy/bibdocfile/webinterface.py
	M			invenio/legacy/bibedit/engine.py
	M			invenio/legacy/bibexport/googlescholar.py
	M			invenio/legacy/bibexport/sitemap.py
	M			invenio/legacy/bibformat/adminlib.py
	M			invenio/legacy/bibindex/adminlib.py
	M			invenio/legacy/bibindex/doc/admin/bibindex-admin-guide.webdoc
	M			invenio/legacy/bibindex/engine.py
	M			invenio/legacy/bibindex/engine_config.py
	M			invenio/legacy/bibindex/engine_utils.py
	M			invenio/legacy/bibrank/citation_indexer.py
	M			invenio/legacy/bibrank/citation_searcher.py
	M			invenio/legacy/bibrank/record_sorter.py
	M			invenio/legacy/bibrank/selfcites_indexer.py
	M			invenio/legacy/bibrank/selfcites_task.py
	M			invenio/legacy/bibrecord/__init__.py
	M			invenio/legacy/bibsched/bibtask.py
	M			invenio/legacy/bibsched/cli.py
	M			invenio/legacy/bibupload/engine.py
	M			invenio/legacy/inveniocfg.py
	M			invenio/legacy/miscutil/data_cacher.py
	M			invenio/legacy/miscutil/sql/tabcreate.sql
	M			invenio/legacy/miscutil/sql/tabdrop.sql
	M			invenio/legacy/miscutil/sql/tabfill.sql
	M			invenio/legacy/refextract/config.py
	M			invenio/legacy/refextract/engine.py
	M			invenio/legacy/refextract/kbs/books.kb
	M			invenio/legacy/refextract/kbs/report-numbers.kb
	M			invenio/legacy/refextract/linker.py
	M			invenio/legacy/search_engine/__init__.py
	M			invenio/legacy/webcomment/templates.py
	M			invenio/legacy/webcomment/webinterface.py
	M			invenio/legacy/webhelp/web/admin/howto/howto-run.webdoc
	M			invenio/legacy/websearch/templates.py
	M			invenio/legacy/websearch/webcoll.py
	M			invenio/legacy/websearch_external_collections/__init__.py
	M			invenio/legacy/websession/session.py
	M			invenio/legacy/websession/templates.py
	M			invenio/legacy/websession/webaccount.py
	M			invenio/legacy/websession/webinterface.py
	M			invenio/legacy/webstat/api.py
	M			invenio/legacy/webstat/engine.py
	M			invenio/legacy/webstyle/templates.py
	M			invenio/legacy/websubmit/doc/hacking/websubmit-file-stamper.webdoc
	M			invenio/legacy/websubmit/engine.py
	M			invenio/legacy/websubmit/file_converter.py
	M			invenio/legacy/websubmit/file_stamper.py
	M			invenio/legacy/websubmit/functions/Create_Modify_Interface.py
	M			invenio/legacy/websubmit/functions/Create_Upload_Files_Interface.py
	M			invenio/legacy/websubmit/functions/Link_Records.py
	M			invenio/legacy/websubmit/functions/Shared_Functions.py
	M			invenio/legacy/websubmit/templates.py
	M			invenio/modules/access/engine.py
	M			invenio/modules/access/local_config.py
	M			invenio/modules/comments/api.py
	M			invenio/modules/deposit/tasks.py
	M			invenio/modules/encoder/batch_engine.py
	M			invenio/modules/exporter/exporterext/configurations/googlescholar.cfg
	M			invenio/modules/formatter/engine.py
	M			invenio/modules/formatter/engines/bfx.py
	A			invenio/modules/formatter/format_elements/bfe_arxiv_link.py
	M			invenio/modules/formatter/format_elements/bfe_authors.py
	M			invenio/modules/formatter/format_elements/bfe_qrcode.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/tokenizers/BibIndexAuthorCountTokenizer.py
	P			invenio/modules/indexer/tokenizers/BibIndexDOITokenizer.py Copied from modules/bibauthorid/lib/bibauthorid_dbinterface_unit_tests.py
	M			invenio/modules/indexer/tokenizers/BibIndexDefaultTokenizer.py
	P			invenio/modules/indexer/tokenizers/BibIndexEmptyTokenizer.py Copied to invenio/modules/indexer/tokenizers/BibIndexStringTokenizer.py
	P			invenio/modules/indexer/tokenizers/BibIndexFilenameTokenizer.py Copied from invenio/modules/indexer/tokenizers/BibIndexFiletypeTokenizer.py
	P			invenio/modules/indexer/tokenizers/BibIndexFiletypeTokenizer.py Copied to invenio/modules/indexer/tokenizers/BibIndexFilenameTokenizer.py
	A			invenio/modules/indexer/tokenizers/BibIndexFilteringTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexItemCountTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexJournalTokenizer.py
	A			invenio/modules/indexer/tokenizers/BibIndexMultiFieldTokenizer.py
	A			invenio/modules/indexer/tokenizers/BibIndexRecJsonTokenizer.py
	P			invenio/modules/indexer/tokenizers/BibIndexStringTokenizer.py Copied from invenio/modules/indexer/tokenizers/BibIndexEmptyTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexTokenizer.py
	M			invenio/modules/records/testsuite/fields/atlantis.cfg
	M			invenio/modules/records/testsuite/test_legacy_record.py
	M			invenio/modules/redirector/redirect_methods/goto_plugin_cern_hr_documents.py
	A			invenio/modules/scheduler/tasklets/bst_create_icons.py
	A			invenio/modules/scheduler/tasklets/bst_create_related_formats.py
	M			invenio/modules/search/fixtures.py
	A			invenio/modules/upgrader/upgrades/invenio_2013_09_10_new_param_websubmit_function.py
	A			invenio/modules/upgrader/upgrades/invenio_2013_10_25_new_param_websubmit_function.py
	P			invenio/modules/upgrader/upgrades/invenio_2013_11_12_new_param_websubmit_function.py Copied from modules/bibauthorid/lib/bibauthorid_dbinterface_unit_tests.py
	A			invenio/modules/upgrader/upgrades/invenio_2013_12_05_new_index_doi.py
	A			invenio/modules/upgrader/upgrades/invenio_2014_01_22_queue_table_virtual_index.py
	P			invenio/modules/upgrader/upgrades/invenio_2014_01_22_redis_sessions.py Copied from modules/bibauthorid/lib/bibauthorid_prob_matrix_unit_tests.py
	V			{invenio/modules/upgrader/upgrades/invenio_2014_01_24_seqSTORE_larger_value.py ← modules/bibauthorid/lib/bibauthorid_prob_matrix_unit_tests.py}
	A			invenio/modules/upgrader/upgrades/invenio_2014_03_13_new_index_filename.py
	M			invenio/testsuite/data/test_authors.cfg
	M			invenio/testsuite/data/test_bibfield.cfg
	P			invenio/testsuite/data/test_title.cfg Copied from modules/bibauthorid/lib/bibauthorid_dbinterface_unit_tests.py
	V			{invenio/testsuite/test_utils_redis.py ← modules/bibauthorid/lib/bibauthorid_dbinterface_unit_tests.py}
	M			invenio/testsuite/test_utils_text.py
	M			invenio/utils/autodiscovery/__init__.py
	M			invenio/utils/container.py
	M			invenio/utils/crossref.py
	M			invenio/utils/html.py
	A			invenio/utils/redis.py
	M			invenio/utils/text.py
	D			modules/bibauthorid/lib/backbone-min.js
	D			modules/bibauthorid/lib/bibauthorid_bib_matrix_unit_tests.py
	D			modules/bibauthorid/lib/bibauthorid_cluster_set_unit_tests.py
	D			modules/bibauthorid/lib/bibauthorid_dbinterface_old.py
	P			modules/bibauthorid/lib/bibauthorid_dbinterface_unit_tests.py Deleted after being copied to multiple locations: invenio/modules/indexer/tokenizers/BibIndexDOITokenizer.py invenio/modules/upgrader/upgrades/invenio_2013_11_12_new_param_websubmit_function.py invenio/testsuite/data/test_title.cfg invenio/testsuite/test_utils_redis.py
	D			modules/bibauthorid/lib/bibauthorid_name_utils_unit_tests.py
	P			modules/bibauthorid/lib/bibauthorid_prob_matrix_unit_tests.py Deleted after being copied to multiple locations: invenio/modules/upgrader/upgrades/invenio_2014_01_22_redis_sessions.py invenio/modules/upgrader/upgrades/invenio_2014_01_24_seqSTORE_larger_value.py
	D			modules/bibcatalog/lib/bibcatalog_unit_tests.py
	D			modules/bibcheck/lib/bibcheck_plugins_unit_tests.py
	D			modules/bibcheck/lib/bibcheck_unit_tests.py
	D			modules/bibrank/lib/bibrank_publication_grapher.py
	M			modules/webauthorprofile/lib/webauthorprofile_unit_tests.py
	M			po/fa.po
	M			requirements-extras.txt
	M			requirements.txt

Merge branch 'master' into nexte3a98eb3aa25Actions

Description

Details

Event Timeline

Merged Changes

Changes (135)

R3600:e3a98eb3aa25

.gitignore

AUTHORS

Makefile.am

NEWS

README

README.rst

RELEASE-NOTES

UNINSTALL

config/invenio.conf

invenio/base/static/css/invenio.css

invenio/base/static/js/ckeditor/journal-editor-styles.js

invenio/ext/legacy/handler.py

invenio/legacy/bibauthorid/webinterface.py

invenio/legacy/bibcatalog/system_rt.py

invenio/legacy/bibdocfile/api.py

invenio/legacy/bibdocfile/managedocfiles.py

invenio/legacy/bibdocfile/plugins/bom_textdoc.py

invenio/legacy/bibdocfile/webinterface.py

invenio/legacy/bibedit/engine.py

invenio/legacy/bibexport/googlescholar.py

invenio/legacy/bibexport/sitemap.py

invenio/legacy/bibformat/adminlib.py

invenio/legacy/bibindex/adminlib.py

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

invenio/legacy/bibindex/engine.py

invenio/legacy/bibindex/engine_config.py

invenio/legacy/bibindex/engine_utils.py

invenio/legacy/bibrank/citation_indexer.py

invenio/legacy/bibrank/citation_searcher.py

invenio/legacy/bibrank/record_sorter.py

invenio/legacy/bibrank/selfcites_indexer.py

invenio/legacy/bibrank/selfcites_task.py

invenio/legacy/bibrecord/__init__.py

invenio/legacy/bibsched/bibtask.py

invenio/legacy/bibsched/cli.py

invenio/legacy/bibupload/engine.py

invenio/legacy/inveniocfg.py

invenio/legacy/miscutil/data_cacher.py

invenio/legacy/miscutil/sql/tabcreate.sql

invenio/legacy/miscutil/sql/tabdrop.sql

invenio/legacy/miscutil/sql/tabfill.sql

invenio/legacy/refextract/config.py

invenio/legacy/refextract/engine.py

invenio/legacy/refextract/kbs/books.kb

invenio/legacy/refextract/kbs/report-numbers.kb

invenio/legacy/refextract/linker.py

invenio/legacy/search_engine/__init__.py

invenio/legacy/webcomment/templates.py

invenio/legacy/webcomment/webinterface.py

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

invenio/legacy/websearch/templates.py

invenio/legacy/websearch/webcoll.py

invenio/legacy/websearch_external_collections/__init__.py

invenio/legacy/websession/session.py

invenio/legacy/websession/templates.py

invenio/legacy/websession/webaccount.py

invenio/legacy/websession/webinterface.py

invenio/legacy/webstat/api.py

invenio/legacy/webstat/engine.py

invenio/legacy/webstyle/templates.py

invenio/legacy/websubmit/doc/hacking/websubmit-file-stamper.webdoc

invenio/legacy/websubmit/engine.py

invenio/legacy/websubmit/file_converter.py

invenio/legacy/websubmit/file_stamper.py

invenio/legacy/websubmit/functions/Create_Modify_Interface.py

invenio/legacy/websubmit/functions/Create_Upload_Files_Interface.py

invenio/legacy/websubmit/functions/Link_Records.py

invenio/legacy/websubmit/functions/Shared_Functions.py

invenio/legacy/websubmit/templates.py

invenio/modules/access/engine.py

invenio/modules/access/local_config.py

invenio/modules/comments/api.py

invenio/modules/deposit/tasks.py

Merge branch 'master' into next
e3a98eb3aa25
Actions

invenio/legacy/bibrecord/init.py

invenio/legacy/search_engine/init.py

invenio/legacy/websearch_external_collections/init.py

invenio/utils/autodiscovery/init.py