Diffusion invenio-infoscience 52c0e682fdcd

Merge branch 'master' into next
52c0e682fdcd
Actions

Authored by kuncar on Jul 6 2014, 14:17.

Description

Merge branch 'master' into next

Conflicts:
invenio/ext/email/__init.py
invenio/legacy/bibedit/engine.py
invenio/legacy/bibmerge/engine.py
invenio/legacy/search_engine/init__.py
invenio/legacy/webmessage/api.py
invenio/legacy/websearch/webinterface.py
invenio/modules/accounts/templates/accounts/lost_base.html
invenio/modules/formatter/format_elements/bfe_fulltext_mini.py
invenio/utils/text.py
modules/bibformat/lib/elements/Makefile.am
modules/miscutil/demo/democfgdata.sql
modules/miscutil/lib/testutils.py
modules/websearch/lib/websearch_regression_tests.py
modules/webstyle/lib/goto_engine.py
modules/websubmit/etc/DEMOART.tpl
modules/websubmit/etc/DEMOARTcreate.tpl
modules/websubmit/lib/websubmit_web_tests.py

Details

Committed

kuncar

Jul 6 2014, 18:20

Parents

R3600:0df49d597d3f: mailutils: fix for send_email() error on DEV site
R3600:6c68947dd9c1: uploader: removal of empty workflows

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:52c0e682fdcd: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jul 6 2014, 18:20

Merged Changes

Commit	Author	Details	Committed
0df49d597d3f	Sebastian Witowski/Tibor Simko	mailutils: fix for send_email() error on DEV site	Jul 2 2014
a9c95bdd812a	Sebastian Witowski/Tibor Simko	WebSearch: fix for 'rhs is of unknown type'	Jul 2 2014
b88b8b506d54	Nikolaos Kasioumis/Tibor Simko	BibDocFile: register downloads with recid	Jul 2 2014
593383af578c	Federico Poli/Tibor Simko	textutils: wash_for_utf8() simplification	Jul 1 2014
a16e441c322b	Jerome Caffaro/Tibor Simko	BibMerge: prevent loss of DOI when merging records	Jun 25 2014
3bd5231ddb47	Jerome Caffaro/Tibor Simko	BibEdit: prevent deletion of managed DOIs fields	Jun 25 2014
76f87951cfe9	Jerome Caffaro/Tibor Simko	BibFormat: advertise /doi URL in DC output	Jun 25 2014
7ab52601be8b	Jerome Caffaro/Tibor Simko	BibFormat: improve Dublin Core output	Jun 25 2014
580ce6cc278b	Jerome Caffaro/Tibor Simko	BibFormat: configurable /record	Jun 25 2014
19d389d9d791	Jerome Caffaro/Tibor Simko	BibFormat: new bfe_oai_identifier element	Jun 25 2014
71e024728972	Jerome Caffaro/Tibor Simko	BibFormat: new bfe_date parsing/formatting options	Jun 25 2014
3e79e1dd1bdd	Jerome Caffaro/Tibor Simko	WebSearch: resolve (internal) DOIs	Jun 25 2014
1b42cb8bb076	Jerome Caffaro/Tibor Simko	WebSubmit: guests support improved in /direct URL	Jun 25 2014
cd00b64d198a	Jerome Caffaro/Tibor Simko	WebSearch: anyfield in CFG_WEBSEARCH_SYNONYM_KBRS	Jun 25 2014
4d569b1b8544	Jerome Caffaro/Tibor Simko	WebSubmit: rotate created icons according to EXIF	Jun 25 2014
8cfaec826dc4	Jerome Caffaro/Tibor Simko	BibDocFile: new web tests	Jun 25 2014
e15afa6fd5a0	Jerome Caffaro/Tibor Simko	WebSubmit: web tests for DEMOART and DEMOPIC	Jun 25 2014
8ce39e5e6fcb	Jerome Caffaro/Tibor Simko	WebSubmit: DEMOART uses bibdocfile_managedocfile	Jun 25 2014
1438a5519d7c	Jerome Caffaro/Tibor Simko	testutils: wait for element to be displayed/hidden	Jun 25 2014
95e060e6bc97	Jerome Caffaro/Tibor Simko	WebStyle: fix gotoadmin CLI parmeters parsing	Jun 25 2014
6bbafae8364e	Jerome Caffaro/Tibor Simko	BibFormat: plot file identification improvements	Jun 25 2014
06bccb31de2c	Luke Andrew Smith/Tibor Simko	WebMessage: English corrections in output messages	Jun 25 2014
76eb23b38550	Ludmila Marian/Tibor Simko	WebSearch: faster collection children cache	Jun 24 2014
d6d4a4485514	Federico Poli/Tibor Simko	textutils: translate_to_ascii() unknown chars fix	Jun 24 2014

Changes (29)

		Path
M		config/invenio.conf
M		invenio/ext/email/__init__.py
M		invenio/legacy/bibedit/engine.py
M		invenio/legacy/bibmerge/engine.py
M		invenio/legacy/inveniocfg.py
M		invenio/legacy/search_engine/__init__.py
M		invenio/legacy/webmessage/api.py
M		invenio/legacy/websearch/templates.py
M		invenio/legacy/websearch/webinterface.py
M		invenio/legacy/websubmit/icon_creator.py
M		invenio/legacy/websubmit/webinterface.py
M		invenio/modules/editor/static/js/editor/display.js
M		invenio/modules/editor/static/js/editor/engine.js
M		invenio/modules/formatter/format_elements/bfe_date.py
M		invenio/modules/formatter/format_elements/bfe_fulltext.py
M		invenio/modules/formatter/format_elements/bfe_fulltext_mini.py
M		invenio/modules/formatter/format_elements/bfe_record_url.py
M		invenio/modules/formatter/format_elements/bfe_server_info.py
M		invenio/modules/formatter/format_templates/DC.xsl
M		invenio/modules/formatter/format_templates/OAI_DC.xsl
M		invenio/modules/merger/static/js/merger/engine.js
A		invenio/testsuite/helper.py
M		invenio/testsuite/test_utils_text.py
M		invenio/utils/text.py
A	(dir)	modules/bibformat/
A	(dir)	modules/bibformat/lib/
A	(dir)	modules/bibformat/lib/elements/
P		modules/bibformat/lib/elements/bfe_oai_identifier.py Copied from invenio/modules/formatter/format_elements/bfe_url.py
D		modules/webauthorlist/lib/authorlist_web_tests.py

Merge branch 'master' into next52c0e682fdcdActions

Description

Details

Event Timeline

Merged Changes

Changes (29)

R3600:52c0e682fdcd

config/invenio.conf

invenio/ext/email/__init__.py

invenio/legacy/bibedit/engine.py

invenio/legacy/bibmerge/engine.py

invenio/legacy/inveniocfg.py

invenio/legacy/search_engine/__init__.py

invenio/legacy/webmessage/api.py

invenio/legacy/websearch/templates.py

invenio/legacy/websearch/webinterface.py

invenio/legacy/websubmit/icon_creator.py

invenio/legacy/websubmit/webinterface.py

invenio/modules/editor/static/js/editor/display.js

invenio/modules/editor/static/js/editor/engine.js

invenio/modules/formatter/format_elements/bfe_date.py

invenio/modules/formatter/format_elements/bfe_fulltext.py

invenio/modules/formatter/format_elements/bfe_fulltext_mini.py

invenio/modules/formatter/format_elements/bfe_record_url.py

invenio/modules/formatter/format_elements/bfe_server_info.py

invenio/modules/formatter/format_templates/DC.xsl

invenio/modules/formatter/format_templates/OAI_DC.xsl

invenio/modules/merger/static/js/merger/engine.js

invenio/testsuite/helper.py

invenio/testsuite/test_utils_text.py

invenio/utils/text.py

modules/bibformat/lib/elements/bfe_oai_identifier.py

modules/webauthorlist/lib/authorlist_web_tests.py

Merge branch 'master' into next
52c0e682fdcd
Actions

invenio/ext/email/init.py

invenio/legacy/search_engine/init.py