Diffusion invenio-infoscience 826cb552c2a0

Merge branch 'master' into next
826cb552c2a0
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 10 2012, 21:34.

Description

Merge branch 'master' into next

master: installation: jQuery Bookmark URL source fix BibHarvest: split of OAIHarvest and OAIRepository BibEdit: split of BibRecord and RefExtract BibRecord: possibility to use lxml parser WebAccess: apikey table name fix WebStyle: workaround IE bug with cache and HTTPS WebAlert: optional display of alert description BibFormat: EndNote fix according to the DTD

Conflicts:
modules/Makefile.am
modules/oaiharvest/web/admin/oai_harvest_admin.js
modules/oaiharvest/web/admin/oaiharvestadmin.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Sep 10 2012, 21:37

Parents

R3600:14ef730888a3: installation: jQuery Bookmark URL source fix
R3600:33c78178a35e: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:826cb552c2a0: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 10 2012, 21:37

Merged Changes

Commit	Author	Details	Committed
14ef730888a3	Tibor Simko	installation: jQuery Bookmark URL source fix	Sep 10 2012
d2da2ea304d2	Tibor Simko	BibHarvest: split of OAIHarvest and OAIRepository	Sep 10 2012
b44dc2229312	Tibor Simko	BibEdit: split of BibRecord and RefExtract	Sep 10 2012
0aae780bbdc7	Nikolaos Kasioumis/Tibor Simko	BibRecord: possibility to use lxml parser	Sep 10 2012
055616d83a98	Lars Holm Nielsen/Tibor Simko	WebAccess: apikey table name fix	Sep 10 2012
169d77e8fd64	Tibor Simko	Merge branch 'maint-1.0'	Sep 10 2012
53c23a8e2f08	Samuele Kaplun/Tibor Simko	WebStyle: workaround IE bug with cache and HTTPS	Sep 10 2012
1ac913b2cd0f	Nikolaos Kasioumis/Tibor Simko	WebAlert: optional display of alert description	Sep 10 2012
f2a6c3fadcdd	Nikolaos Kasioumis/Tibor Simko	BibFormat: EndNote fix according to the DTD	Sep 10 2012

Changes (213)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
M		AUTHORS
M		INSTALL
M		Makefile.am
M		config/invenio.conf
M		configure.ac
M		modules/Makefile.am
M		modules/bibconvert/doc/admin/bibconvert-admin-guide.webdoc
M		modules/bibconvert/lib/bibconvert_xslt_engine.py
M		modules/bibedit/bin/Makefile.am
V		modules/{bibedit → refextract}/bin/refextract.in
V		modules/{bibedit → bibrecord}/bin/textmarc2xmlmarc.in
V		modules/{bibedit → bibrecord}/bin/xmlmarc2textmarc.in
V		modules/{bibedit → bibrecord}/bin/xmlmarclint.in
P		modules/bibedit/doc/hacking/Makefile.am Copied to multiple locations: modules/bibrecord/bin/Makefile.am modules/bibrecord/doc/hacking/Makefile.am modules/bibrecord/lib/Makefile.am
V		modules/{bibedit/doc/hacking/bibedit-internals.webdoc → bibrecord/doc/hacking/bibrecord-internals.webdoc}
V		modules/{bibedit → bibrecord}/etc/MARC21slim.dtd
M		modules/bibedit/etc/Makefile.am
V		modules/{bibedit → refextract}/etc/refextract-authors.kb
V		modules/{bibedit → refextract}/etc/refextract-job-preprints.cfg
V		modules/{bibedit → refextract}/etc/refextract-journal-titles.kb
V		modules/{bibedit → refextract}/etc/refextract-report-numbers.kb
M		modules/bibedit/lib/Makefile.am
V		modules/{bibedit → bibrecord}/lib/bibrecord.py
V		modules/{bibedit → bibrecord}/lib/bibrecord_config.py
V		modules/{bibedit → bibrecord}/lib/bibrecord_unit_tests.py
V		modules/{bibedit → refextract}/lib/refextract.py
V		modules/{bibedit → refextract}/lib/refextract_authextract_unit_tests.py
V		modules/{bibedit → refextract}/lib/refextract_cli.py
V		modules/{bibedit → refextract}/lib/refextract_config.py
V		modules/{bibedit → refextract}/lib/refextract_daemon.py
V		modules/{bibedit → refextract}/lib/refextract_unit_tests.py
V		modules/{bibedit → bibrecord}/lib/textmarc2xmlmarc.py
V		modules/{bibedit → bibrecord}/lib/xmlmarc2textmarc.py
M		modules/bibformat/etc/format_templates/Default_HTML_actions.bft
M		modules/bibformat/etc/format_templates/EndNote.xsl
M		modules/bibformat/etc/format_templates/Makefile.am
M		modules/bibformat/etc/output_formats/Makefile.am
A		modules/bibformat/etc/output_formats/XE8X.bfo
M		modules/bibformat/lib/bibformat_xslt_engine.py
D		modules/bibharvest
P		modules/bibharvest/Makefile.am Deleted after being copied to multiple locations: modules/oairepository/Makefile.am modules/oairepository/web/admin/Makefile.am
D		modules/bibharvest/bin
V		modules/{bibharvest → oaiharvest}/bin/Makefile.am
V		modules/{bibharvest → oaiharvest}/bin/oaiharvest.in
V		modules/{bibharvest → oairepository}/bin/oairepositoryupdater.in
D		modules/bibharvest/doc
V		modules/{bibharvest → oaiharvest}/doc/Makefile.am
D		modules/bibharvest/doc/admin
P		modules/bibharvest/doc/admin/Makefile.am Deleted after being copied to multiple locations: modules/bibrecord/etc/Makefile.am modules/oaiharvest/doc/admin/Makefile.am modules/oairepository/doc/admin/Makefile.am modules/refextract/etc/Makefile.am
D		modules/bibharvest/doc/admin/bibharvest-admin-guide.webdoc
V		modules/{bibharvest/doc/admin/oai-admin-guide.webdoc → oaiharvest/doc/admin/oaiharvest-admin-guide.webdoc}
V	(dir)	modules/{bibharvest/doc/hacking/ → oaiharvest/doc/hacking}
V		modules/{bibharvest → oaiharvest}/doc/hacking/Makefile.am
D		modules/bibharvest/etc
V		modules/{bibharvest → oairepository}/etc/Makefile.am
V		modules/{bibharvest → oairepository}/etc/OAI-PMH.xsd
V		modules/{bibharvest → oairepository}/etc/oai2.xsl.v1.0
D		modules/bibharvest/lib
P		modules/bibharvest/lib/Makefile.am Deleted after being copied to multiple locations: modules/oaiharvest/lib/Makefile.am modules/oairepository/lib/Makefile.am
V		modules/{bibharvest/lib/bibharvest_templates.py → oaiharvest/lib/oai_harvest_templates.py}
V		modules/{bibharvest/lib/bibharvest_web_tests.py → oaiharvest/lib/oai_harvest_web_tests.py}
V		modules/{bibharvest → oaiharvest}/lib/oai_harvest_admin.py
V		modules/{bibharvest → oaiharvest}/lib/oai_harvest_admin_regression_tests.py
V		modules/{bibharvest → oaiharvest}/lib/oai_harvest_config.py
V		modules/{bibharvest → oaiharvest}/lib/oai_harvest_daemon.py
V		modules/{bibharvest → oaiharvest}/lib/oai_harvest_dblayer.py
V		modules/{bibharvest → oaiharvest}/lib/oai_harvest_getter.py
V		modules/{bibharvest → oairepository}/lib/oai_repository_admin.py
V		modules/{bibharvest → oairepository}/lib/oai_repository_admin_regression_tests.py
V		modules/{bibharvest → oairepository}/lib/oai_repository_config.py
V		modules/{bibharvest → oairepository}/lib/oai_repository_regression_tests.py
V		modules/{bibharvest → oairepository}/lib/oai_repository_server.py
V		modules/{bibharvest → oairepository}/lib/oai_repository_unit_tests.py
V		modules/{bibharvest → oairepository}/lib/oai_repository_updater.py
V		modules/{bibharvest → oairepository}/lib/oai_repository_webinterface.py
D		modules/bibharvest/web
P		modules/bibharvest/web/Makefile.am Deleted after being copied to multiple locations: modules/bibrecord/Makefile.am modules/bibrecord/doc/Makefile.am modules/bibrecord/doc/admin/Makefile.am modules/oaiharvest/Makefile.am modules/oaiharvest/web/Makefile.am modules/oairepository/bin/Makefile.am modules/oairepository/doc/Makefile.am modules/oairepository/doc/hacking/Makefile.am modules/oairepository/web/Makefile.am modules/refextract/Makefile.am modules/refextract/bin/Makefile.am modules/refextract/doc/Makefile.am modules/refextract/doc/admin/Makefile.am modules/refextract/doc/hacking/Makefile.am
D		modules/bibharvest/web/admin
P		modules/bibharvest/web/admin/Makefile.am Deleted after being copied to multiple locations: modules/oaiharvest/web/admin/Makefile.am modules/refextract/lib/Makefile.am
V		modules/{bibharvest → oaiharvest}/web/admin/oai_harvest_admin.js
V		modules/{bibharvest → oaiharvest}/web/admin/oaiharvestadmin.py
V		modules/{bibharvest → oairepository}/web/admin/oairepositoryadmin.py
M		modules/bibindex/lib/bibindexadminlib.py
M		modules/bibknowledge/lib/bibknowledge.py
A	(dir)	modules/bibrecord/
P		modules/bibrecord/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/bibrecord/bin/
P		modules/bibrecord/bin/Makefile.am Copied from modules/bibedit/doc/hacking/Makefile.am
V		modules/{bibrecord ← bibedit}/bin/textmarc2xmlmarc.in
V		modules/{bibrecord ← bibedit}/bin/xmlmarc2textmarc.in
V		modules/{bibrecord ← bibedit}/bin/xmlmarclint.in
A	(dir)	modules/bibrecord/doc/
P		modules/bibrecord/doc/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/bibrecord/doc/admin/
P		modules/bibrecord/doc/admin/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/bibrecord/doc/hacking/
P		modules/bibrecord/doc/hacking/Makefile.am Copied from modules/bibedit/doc/hacking/Makefile.am
V		modules/{bibrecord/doc/hacking/bibrecord-internals.webdoc ← bibedit/doc/hacking/bibedit-internals.webdoc}
A	(dir)	modules/bibrecord/etc/
V		modules/{bibrecord ← bibedit}/etc/MARC21slim.dtd
P		modules/bibrecord/etc/Makefile.am Copied from modules/bibharvest/doc/admin/Makefile.am
A	(dir)	modules/bibrecord/lib/
P		modules/bibrecord/lib/Makefile.am Copied from modules/bibedit/doc/hacking/Makefile.am
V		modules/{bibrecord ← bibedit}/lib/bibrecord.py
V		modules/{bibrecord ← bibedit}/lib/bibrecord_config.py
V		modules/{bibrecord ← bibedit}/lib/bibrecord_unit_tests.py
V		modules/{bibrecord ← bibedit}/lib/textmarc2xmlmarc.py
V		modules/{bibrecord ← bibedit}/lib/xmlmarc2textmarc.py
M		modules/bibsched/doc/admin/bibsched-admin-guide.webdoc
M		modules/miscutil/sql/tabfill.sql
A	(dir)	modules/oaiharvest/
P		modules/oaiharvest/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/oaiharvest/bin/
V		modules/{oaiharvest ← bibharvest}/bin/Makefile.am
V		modules/{oaiharvest ← bibharvest}/bin/oaiharvest.in
A	(dir)	modules/oaiharvest/doc/
V		modules/{oaiharvest ← bibharvest}/doc/Makefile.am
A	(dir)	modules/oaiharvest/doc/admin/
P		modules/oaiharvest/doc/admin/Makefile.am Copied from modules/bibharvest/doc/admin/Makefile.am
V		modules/{oaiharvest/doc/admin/oaiharvest-admin-guide.webdoc ← bibharvest/doc/admin/oai-admin-guide.webdoc}
V	(dir)	modules/{oaiharvest/doc/hacking/ ← bibharvest/doc/hacking}
V		modules/{oaiharvest ← bibharvest}/doc/hacking/Makefile.am
A	(dir)	modules/oaiharvest/lib/
P		modules/oaiharvest/lib/Makefile.am Copied from modules/bibharvest/lib/Makefile.am
V		modules/{oaiharvest ← bibharvest}/lib/oai_harvest_admin.py
V		modules/{oaiharvest ← bibharvest}/lib/oai_harvest_admin_regression_tests.py
V		modules/{oaiharvest ← bibharvest}/lib/oai_harvest_config.py
V		modules/{oaiharvest ← bibharvest}/lib/oai_harvest_daemon.py
V		modules/{oaiharvest ← bibharvest}/lib/oai_harvest_dblayer.py
V		modules/{oaiharvest ← bibharvest}/lib/oai_harvest_getter.py
V		modules/{oaiharvest/lib/oai_harvest_templates.py ← bibharvest/lib/bibharvest_templates.py}
V		modules/{oaiharvest/lib/oai_harvest_web_tests.py ← bibharvest/lib/bibharvest_web_tests.py}
A	(dir)	modules/oaiharvest/web/
P		modules/oaiharvest/web/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/oaiharvest/web/admin/
P		modules/oaiharvest/web/admin/Makefile.am Copied from modules/bibharvest/web/admin/Makefile.am
V		modules/{oaiharvest ← bibharvest}/web/admin/oai_harvest_admin.js
V		modules/{oaiharvest ← bibharvest}/web/admin/oaiharvestadmin.py
A	(dir)	modules/oairepository/
P		modules/oairepository/Makefile.am Copied from modules/bibharvest/Makefile.am
A	(dir)	modules/oairepository/bin/
P		modules/oairepository/bin/Makefile.am Copied from modules/bibharvest/web/Makefile.am
V		modules/{oairepository ← bibharvest}/bin/oairepositoryupdater.in
A	(dir)	modules/oairepository/doc/
P		modules/oairepository/doc/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/oairepository/doc/admin/
P		modules/oairepository/doc/admin/Makefile.am Copied from modules/bibharvest/doc/admin/Makefile.am
A		modules/oairepository/doc/admin/oairepository-admin-guide.webdoc
A	(dir)	modules/oairepository/doc/hacking/
P		modules/oairepository/doc/hacking/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/oairepository/etc/
V		modules/{oairepository ← bibharvest}/etc/Makefile.am
V		modules/{oairepository ← bibharvest}/etc/OAI-PMH.xsd
V		modules/{oairepository ← bibharvest}/etc/oai2.xsl.v1.0
A	(dir)	modules/oairepository/lib/
V		modules/{oairepository ← bibharvest}/lib/Makefile.am
V		modules/{oairepository ← bibharvest}/lib/oai_repository_admin.py
V		modules/{oairepository ← bibharvest}/lib/oai_repository_admin_regression_tests.py
V		modules/{oairepository ← bibharvest}/lib/oai_repository_config.py
V		modules/{oairepository ← bibharvest}/lib/oai_repository_regression_tests.py
V		modules/{oairepository ← bibharvest}/lib/oai_repository_server.py
V		modules/{oairepository ← bibharvest}/lib/oai_repository_unit_tests.py
V		modules/{oairepository ← bibharvest}/lib/oai_repository_updater.py
V		modules/{oairepository ← bibharvest}/lib/oai_repository_webinterface.py
A	(dir)	modules/oairepository/web/
P		modules/oairepository/web/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/oairepository/web/admin/
V		modules/{oairepository/web/admin ← bibharvest}/Makefile.am
V		modules/{oairepository ← bibharvest}/web/admin/oairepositoryadmin.py
A	(dir)	modules/refextract/
P		modules/refextract/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/refextract/bin/
P		modules/refextract/bin/Makefile.am Copied from modules/bibharvest/web/Makefile.am
V		modules/{refextract ← bibedit}/bin/refextract.in
A	(dir)	modules/refextract/doc/
P		modules/refextract/doc/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/refextract/doc/admin/
P		modules/refextract/doc/admin/Makefile.am Copied from modules/bibharvest/web/Makefile.am
A	(dir)	modules/refextract/doc/hacking/
V		modules/{refextract/doc/hacking ← bibharvest/web}/Makefile.am
A	(dir)	modules/refextract/etc/
V		modules/{refextract/etc ← bibharvest/doc/admin}/Makefile.am
V		modules/{refextract ← bibedit}/etc/refextract-authors.kb
V		modules/{refextract ← bibedit}/etc/refextract-job-preprints.cfg
V		modules/{refextract ← bibedit}/etc/refextract-journal-titles.kb
V		modules/{refextract ← bibedit}/etc/refextract-report-numbers.kb
A	(dir)	modules/refextract/lib/
V		modules/{refextract/lib ← bibharvest/web/admin}/Makefile.am
V		modules/{refextract ← bibedit}/lib/refextract.py
V		modules/{refextract ← bibedit}/lib/refextract_authextract_unit_tests.py
V		modules/{refextract ← bibedit}/lib/refextract_cli.py
V		modules/{refextract ← bibedit}/lib/refextract_config.py
V		modules/{refextract ← bibedit}/lib/refextract_daemon.py
V		modules/{refextract ← bibedit}/lib/refextract_unit_tests.py
M		modules/webaccess/lib/access_control_config.py
M		modules/webaccess/lib/webaccessadmin_lib.py
M		modules/webalert/lib/alert_engine.py
M		modules/webalert/lib/webalert_templates.py
M		modules/webbasket/lib/webbasket.py
M		modules/webbasket/lib/webbasket_templates.py
M		modules/webhelp/web/admin/admin.webdoc
M		modules/webhelp/web/hacking/hacking.webdoc
M		modules/webhelp/web/hacking/modules-overview.webdoc
M		modules/websearch/lib/search_engine.py
M		modules/websearch/lib/websearch_external_collections_parser.py
M		modules/websearch/lib/websearch_templates.py
M		modules/websession/lib/inveniogc.py
M		modules/websession/lib/webaccount.py
M		modules/websession/lib/websession_templates.py
M		modules/webstyle/css/invenio.css
M		modules/webstyle/lib/webinterface_handler.py
M		modules/webstyle/lib/webinterface_handler_wsgi_utils.py