Diffusion invenio-infoscience c94993dc9f42

Merge branch 'master' into next
c94993dc9f42
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 22 2013, 15:48.

Description

Merge branch 'master' into next

master: (25 commits) BibEdit: import CrossRef data BibMerge: delete cache file on submit BibFormat: passing of user_info for Excel format htmlutils: MathJax 2.1 InvenioConnector: fix for CDS authentication WebStyle: goto engine typo fix BibIndex: fix for external fulltext indexing errorlib: hiding bibcatalog info in exception body BatchUploader: bibtask logs via email BibSched: new --email-logs-to bibtask CLI mailutils: send_email() with attachments BibFormat: remove 0248_a field from title WebStyle: canonical and alternate URLs BibEdit: improvements and fixes BibEdit: css changes BibEdit: allow opening deleted records Inveniogc: delete BibEdit temporary files BibEdit: delete cache if record not modified BibEdit: add extraction of references from URL BibEdit: several fixes ...

Conflicts:
modules/miscutil/lib/Makefile.am
modules/webstyle/lib/webstyle_templates.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Jan 22 2013, 15:48

Parents

R3600:d68453ff68b6: BibEdit: import CrossRef data
R3600:e97342fc9476: BibEdit: invenio_2012_11_15_bibdocfile_model fix

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:c94993dc9f42: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 22 2013, 15:48

Merged Changes

Commit	Author	Details	Committed
d68453ff68b6	Sebastian Witowski/Tibor Simko	BibEdit: import CrossRef data	Jan 22 2013
a3c27a3b69b3	Tibor Simko	Merge branch 'maint-1.1'	Jan 22 2013
dc7d70434be4	Javier Martin Montull/Tibor Simko	BibMerge: delete cache file on submit	Jan 22 2013
c51deedda280	Tibor Simko	Merge branch 'jmartinm/cataloguing-improvements'	Jan 22 2013
4206e12a612e	Tibor Simko	Merge branch 'maint-1.1'	Jan 22 2013
04da0bdad240	Ludmila Marian/Tibor Simko	BibFormat: passing of user_info for Excel format	Jan 22 2013
eef54601bf1a	Tibor Simko	Merge branch 'maint-1.1'	Jan 22 2013
a6a246c52f5e	Samuele Kaplun/Tibor Simko	htmlutils: MathJax 2.1	Jan 22 2013
10a6ad88ec60	Tibor Simko	Merge branch 'maint-1.1'	Jan 22 2013
0ad955e060c5	Jerome Caffaro/Tibor Simko	InvenioConnector: fix for CDS authentication	Jan 22 2013
707e94c12430	Jiri Kuncar/Tibor Simko	WebStyle: goto engine typo fix	Jan 22 2013
00e6d86b236c	Patrick Glauner/Tibor Simko	BibIndex: fix for external fulltext indexing	Jan 21 2013
6172c9cd9bb4	Tibor Simko	Merge branch 'maint-1.1'	Jan 18 2013
b9de04af831e	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Jan 18 2013
60b424eb5a5a	Samuele Kaplun/Tibor Simko	errorlib: hiding bibcatalog info in exception body	Jan 18 2013
33e6a0426b9c	Samuele Kaplun/Tibor Simko	BatchUploader: bibtask logs via email	Jan 16 2013
9369361849c6	Samuele Kaplun/Tibor Simko	BibSched: new --email-logs-to bibtask CLI	Jan 16 2013
dabbd7e5b543	Samuele Kaplun/Tibor Simko	mailutils: send_email() with attachments	Jan 16 2013
e368172bc182	Jerome Caffaro/Tibor Simko	BibFormat: remove 0248_a field from title	Jan 16 2013
931b67e0fe38	Samuele Kaplun/Tibor Simko	WebStyle: canonical and alternate URLs	Jan 16 2013
fd9209f8a759	Javier Martin Montull	BibEdit: improvements and fixes	Dec 20 2012
9bc27a33a463	Javier Martin Montull	BibEdit: css changes	Dec 20 2012
275ed4165e55	Javier Martin Montull	BibEdit: allow opening deleted records	Dec 20 2012
ee92fecfd6b0	Javier Martin Montull	Inveniogc: delete BibEdit temporary files	Dec 20 2012
f89239cacf03	Javier Martin Montull	BibEdit: delete cache if record not modified	Dec 20 2012
d64f25819deb	Javier Martin Montull	BibEdit: add extraction of references from URL	Dec 20 2012
3a471e8b953b	Javier Martin Montull	BibEdit: several fixes	Dec 20 2012
47ea5216da9a	Javier Martin Montull	BibEdit: introduce textmarc editor	Dec 20 2012
8aa7059bd860	Sebastian Witowski/Javier Martin Montull	BibEditMulti: multiple improvements and fixes	Dec 20 2012
8c279216ba4f	Javier Martin Montull	BibEdit: cnum generation on conference records	Dec 20 2012
5909fe52019a	Javier Martin/Javier Martin Montull	BibEdit: multiple improvements	Dec 20 2012
56940c9ef638	Javier Martin/Javier Martin Montull	BatchUploader: multiple improvements	Dec 20 2012

Changes (60)

				Path
	M			Makefile.am
	M			config/invenio.conf
	M			modules/bibconvert/etc/Makefile.am
	A			modules/bibconvert/etc/crossref2marcxml.xsl
	M			modules/bibdocfile/lib/bibdocfile.py
	M			modules/bibedit/etc/Makefile.am
	M			modules/bibedit/lib/Makefile.am
	A			modules/bibedit/lib/bibedit.css
	M			modules/bibedit/lib/bibedit_config.py
	M			modules/bibedit/lib/bibedit_display.js
	M			modules/bibedit/lib/bibedit_engine.js
	M			modules/bibedit/lib/bibedit_engine.py
	M			modules/bibedit/lib/bibedit_keys.js
	M			modules/bibedit/lib/bibedit_menu.js
	A			modules/bibedit/lib/bibedit_refextract.js
	M			modules/bibedit/lib/bibedit_templates.py
	A			modules/bibedit/lib/bibedit_unit_tests.py
	M			modules/bibedit/lib/bibedit_utils.py
	M			modules/bibedit/lib/bibedit_web_tests.py
	M			modules/bibedit/lib/bibedit_webinterface.py
	M			modules/bibedit/lib/bibeditmulti.js
	M			modules/bibedit/lib/bibeditmulti_engine.py
	M			modules/bibedit/lib/bibeditmulti_templates.py
	M			modules/bibedit/lib/bibeditmulti_webinterface.py
	M			modules/bibexport/etc/sitemap.cfg
	M			modules/bibexport/lib/bibexport_method_sitemap.py
	M			modules/bibformat/doc/admin/bibformat-admin-guide.webdoc
	M			modules/bibformat/lib/bibformat.py
	M			modules/bibformat/lib/elements/bfe_title.py
	M			modules/bibindex/lib/bibindex_engine.py
	M			modules/bibmerge/lib/bibmerge_engine.py
	M			modules/bibrecord/lib/bibrecord.py
	M			modules/bibrecord/lib/textmarc2xmlmarc.py
	M			modules/bibrecord/lib/xmlmarc2textmarc.py
	M			modules/bibsched/lib/bibtask.py
	M			modules/bibupload/lib/Makefile.am
	A			modules/bibupload/lib/batchuploader.js
	M			modules/bibupload/lib/batchuploader_engine.py
	M			modules/bibupload/lib/batchuploader_templates.py
	M			modules/bibupload/lib/batchuploader_webinterface.py
	M			modules/miscutil/lib/Makefile.am
	A			modules/miscutil/lib/crossrefutils.py
	M			modules/miscutil/lib/errorlib.py
	M			modules/miscutil/lib/htmlutils.py
	M			modules/miscutil/lib/invenio_connector.py
	M			modules/miscutil/lib/mailutils.py
	M			modules/miscutil/lib/sequtils_cnum.py
	M			modules/miscutil/lib/urlutils.py
	M			modules/webhelp/web/admin/howto/howto-run.webdoc
	M			modules/weblinkback/lib/weblinkback_templates.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websession/lib/inveniogc.py
	M			modules/webstyle/img/Makefile.am
	A			modules/webstyle/img/bibedit_extract_url.png
	A			modules/webstyle/img/bibedit_tableview.png
	A			modules/webstyle/img/bibedit_textmarc.png
	A			modules/webstyle/img/edit-paste.png
	A			modules/webstyle/img/ref_extract.png
	M			modules/webstyle/lib/goto_engine.py
	M			modules/webstyle/lib/webstyle_templates.py