Diffusion invenio-infoscience 45a7fa3381b5

Merge branch 'master' into next
45a7fa3381b5
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 27 2011, 14:57.

Description

Merge branch 'master' into next

master: (157 commits) WebSession: prevent XSS in login form BatchUploader: do not wash file with wash_urlargd() InvenioConnector: use Invenio user agent CKEditor: enable native spellchecker installation: fix xtrJOB table creation statement BibSched: no-locking-based multinode support WebStyle: fix jquery.min.js inclusion for HTTPS BibAuthorID: make stub page config SSL ready WebAccess: enable IP checks for INSPIRE robots WebStyle: enforce SSL on INSPIRE login URLs WebSearch: adapt web tests to the new framework test suite: new web test framework BibClassify: rdflib is again optional installation: do not index remote files by default BibIndex: fix double-stemming upon indexing bibdocfile: fix documentation WRT --with-version BibMerge: order subfields in slave record textutils: wash_for_utf8() and Unicode strings kwalitee: eval/execfile call checking kwalitee: remove old SQL check for escape_string() ...

Merge remarks: Big merge with many amendments. Some are known not to work, e.g. not all jQuery dependencies are treated properly. Amendments will follow.

Conflicts:
Makefile.am
config/invenio.conf
modules/bibcirculation/lib/bibcirculation_daemon.py
modules/bibcirculation/lib/bibcirculation_templates.py
modules/bibcirculation/lib/bibcirculation_utils.py
modules/bibedit/lib/bibedit_engine.js
modules/bibedit/lib/bibedit_engine.py
modules/bibedit/lib/bibedit_templates.py
modules/bibedit/lib/bibeditmulti_templates.py
modules/bibharvest/lib/bibharvest_templates.py
modules/bibmerge/lib/bibmerge_webinterface.py
modules/bibsched/lib/bibtask_config.py
modules/bibupload/lib/batchuploader_templates.py
modules/miscutil/lib/inveniocfg.py
modules/webstyle/css/invenio.css
modules/webstyle/lib/webinterface_layout.py
modules/websubmit/lib/functions/Move_Photos_to_Storage.py
modules/websubmit/lib/websubmit_managedocfiles.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Dec 19 2011, 14:45

Parents

R3600:50f83453c083: WebSession: prevent XSS in login form
R3600:7aec04dc3fa8: BibEdit: fix return binding on Jeditable cells

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:45a7fa3381b5: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Dec 19 2011, 14:45

Merged Changes

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

Commit	Author	Details	Committed
50f83453c083	Samuele Kaplun/Tibor Simko	WebSession: prevent XSS in login form	Sep 27 2011
93547689af98	Jerome Caffaro/Tibor Simko	BatchUploader: do not wash file with wash_urlargd()	Sep 26 2011
faff22d14fa6	Jerome Caffaro/Tibor Simko	InvenioConnector: use Invenio user agent	Sep 26 2011
ba46bf339840	Jerome Caffaro/Tibor Simko	CKEditor: enable native spellchecker	Sep 26 2011
140b48a20541	Tibor Simko	installation: fix xtrJOB table creation statement	Sep 26 2011
826b22058485	Samuele Kaplun/Tibor Simko	BibSched: no-locking-based multinode support	Sep 26 2011
30d6bef2f105	Tibor Simko	WebStyle: fix jquery.min.js inclusion for HTTPS	Sep 15 2011
8abea1a945f5	Henning Weiler/Tibor Simko	BibAuthorID: make stub page config SSL ready	Sep 14 2011
4a0ad7a51337	Henning Weiler/Tibor Simko	WebAccess: enable IP checks for INSPIRE robots	Sep 14 2011
b84ad1e94a6b	Henning Weiler/Tibor Simko	WebStyle: enforce SSL on INSPIRE login URLs	Sep 14 2011
9ffadff3c3ef	Tibor Simko	WebSearch: adapt web tests to the new framework	Sep 13 2011
8b1dff239658	Tibor Simko	test suite: new web test framework	Sep 13 2011
a25c1b06cffe	Roman Chyla/Tibor Simko	BibClassify: rdflib is again optional	Sep 13 2011
c8986076f9d5	Tibor Simko	installation: do not index remote files by default	Sep 12 2011
699ff0dd7f44	Tibor Simko	Merge branch 'maint'	Sep 12 2011
4f37b87ffdd3	Samuele Kaplun/Tibor Simko	BibIndex: fix double-stemming upon indexing	Sep 12 2011
5dd49f3d776c	Samuele Kaplun/Tibor Simko	bibdocfile: fix documentation WRT --with-version	Sep 12 2011
e81b5cd04964	Javier Martin/Tibor Simko	BibMerge: order subfields in slave record	Sep 12 2011
f6686230921b	Joe Blaylock/Tibor Simko	textutils: wash_for_utf8() and Unicode strings	Sep 12 2011
217d8ce37801	Tibor Simko	kwalitee: eval/execfile call checking	Sep 12 2011
b1508ef60bbb	Tibor Simko	kwalitee: remove old SQL check for escape_string()	Sep 12 2011
17f3f6e5e950	Vasanth Venkatraman/Tibor Simko	BibSched: configurable monotasks	Sep 12 2011
b2b732e50070	Patrick Glauner/Tibor Simko	BibSword: cleaner SQL statements	Sep 12 2011
c6528a3f731e	Tibor Simko	kwalitee: SQL query checking	Sep 12 2011
52ecbd2b3501	Nikola Yolov/Tibor Simko	BibAuthorID: personID garbage collector hotfix	Sep 5 2011
ce8477c0a0b2	Samuele Carli/Tibor Simko	BibAuthorID: CLI option for modified records	Sep 5 2011
9558e7c66dc7	Tibor Simko	installation: allow non-standard HTTP/HTTPS ports	Sep 4 2011
f4552468dca1	Samuele Carli/Tibor Simko	BibAuthorID: small UI fixes	Sep 2 2011
3f34ee41d07f	Samuele Kaplun/Tibor Simko	BibSched: improve bibsched pid handling	Aug 31 2011
f4d827611274	Henning Weiler/Tibor Simko	BibCirculation: change item update workflow	Aug 30 2011
035071b306eb	Samuele Kaplun/Tibor Simko	BibFormat: add bfe_bookmark and bfe_sciencewise	Aug 30 2011
6ef71d826077	Samuele Kaplun/Tibor Simko	global: include jquery.min.js in all HTML pages	Aug 30 2011
f119a2a504a2	Tibor Simko	Merge branch 'maint'	Aug 30 2011
0c87949c7269	Ludmila Marian/Tibor Simko	WebSearch: fix collection translation in admin UI	Aug 30 2011
c5c240e3e3ad	Valkyrie Savage/Tibor Simko	WebSearch: type and field codes	Aug 30 2011
df9f2a5f6ee6	Samuele Carli/Tibor Simko	BibAuthorID: UI fixes	Aug 29 2011
8cf4a1e8dbd1	Tibor Simko	Merge branch 'chayward/refextract-daemon-clean'	Aug 29 2011
daa6c5b246cc	Christopher Hayward	refextract: always use timestamped xml output	Aug 29 2011
6bc44f578142	Samuele Carli/Tibor Simko	BibAuthorID: arXiv stub hotfix	Aug 29 2011
f7182609ef22	Samuele Carli/Tibor Simko	BibAuthorID: backend and frontend updates	Aug 29 2011
4a72899341a4	Samuele Kaplun/Tibor Simko	bibdocfile: add --with-flags CLI parameter	Aug 29 2011
6aac4bbf260f	Christopher Hayward	refextract: add recid support to extraction-jobs	Aug 28 2011
f5fb83b74b80	Christopher Hayward	refextract: write references to timestamped file	Aug 26 2011
e8f161a83add	Christopher Hayward	refextract: add output file directory message	Aug 26 2011
cfbb67735b69	Björn Oltmanns/Tibor Simko	BibEncode: initial release	Aug 25 2011
85a4d09546e5	Christopher Hayward	refextract: introduce daemon operation mode	Aug 24 2011
def5825196d3	Björn Oltmanns/Tibor Simko	BibSched: multi-node support	Aug 22 2011
3084a5ad00c6	Björn Oltmanns/Tibor Simko	WebComment: CSS refactoring	Aug 22 2011
dd16139c886d	Tibor Simko	BibFormat: fix bibreformat format visibility check	Aug 22 2011
f879a28794f2	Benoit Thiell/Tibor Simko	remote debugger: Python 2.4 compatibility	Aug 22 2011

Changes (334)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
M		ABOUT-NLS
M		INSTALL
M		Makefile.am
M		THANKS
M		config/invenio-autotools.conf.in
M		config/invenio.conf
M		configure-tests.py
M		configure.ac
M		modules/Makefile.am
P		modules/bibauthorid/Makefile.am Copied to multiple locations: modules/bibauthorid/etc/Makefile.am modules/bibencode/Makefile.am modules/bibencode/bin/Makefile.am modules/bibencode/bin/bibencode.in modules/bibencode/etc/Makefile.am modules/miscutil/etc/ckeditor_scientificchar/Makefile.am modules/miscutil/etc/ckeditor_scientificchar/dialogs/Makefile.am modules/miscutil/etc/ckeditor_scientificchar/lang/Makefile.am
P		modules/bibauthorid/etc/Makefile.am Copied from modules/bibauthorid/Makefile.am
P		modules/bibauthorid/etc/name_authority_files/Makefile.am Copied from modules/bibsched/lib/tasklets/Makefile.am
M		modules/bibauthorid/lib/bibauthorid.py
M		modules/bibauthorid/lib/bibauthorid_authorname_utils.py
M		modules/bibauthorid/lib/bibauthorid_cli.py
M		modules/bibauthorid/lib/bibauthorid_comparison_functions/aid_cmp_affiliations.py
M		modules/bibauthorid/lib/bibauthorid_comparison_functions/aid_cmp_coauthorship.py
M		modules/bibauthorid/lib/bibauthorid_comparison_functions/aid_cmp_inspireids.py
M		modules/bibauthorid/lib/bibauthorid_comparison_functions/aid_cmp_topcites.py
M		modules/bibauthorid/lib/bibauthorid_config.py
M		modules/bibauthorid/lib/bibauthorid_daemon.py
M		modules/bibauthorid/lib/bibauthorid_personid_tables_utils.py
M		modules/bibauthorid/lib/bibauthorid_realauthor_utils.py
M		modules/bibauthorid/lib/bibauthorid_structs.py
M		modules/bibauthorid/lib/bibauthorid_tables_utils.py
M		modules/bibauthorid/lib/bibauthorid_templates.py
M		modules/bibauthorid/lib/bibauthorid_tests.py
M		modules/bibauthorid/lib/bibauthorid_utils.py
M		modules/bibauthorid/lib/bibauthorid_virtualauthor_utils.py
M		modules/bibauthorid/lib/bibauthorid_webapi.py
M		modules/bibauthorid/lib/bibauthorid_webinterface.py
M		modules/bibcatalog/lib/bibcatalog_system.py
M		modules/bibcatalog/lib/bibcatalog_system_rt.py
M		modules/bibcirculation/lib/bibcirculation_templates.py
M		modules/bibcirculation/lib/bibcirculation_utils.py
M		modules/bibclassify/Makefile.am
M		modules/bibclassify/doc/admin/bibclassify-admin-guide.webdoc
A	(dir)	modules/bibclassify/etc/
P		modules/bibclassify/etc/Makefile.am Copied from modules/bibsched/lib/tasklets/Makefile.am
A		modules/bibclassify/etc/microtests.cfg
A		modules/bibclassify/etc/test.rdf
P		modules/bibclassify/lib/Makefile.am Copied to modules/bibformat/lib/elements/bfe_video_bigthumb.py
M		modules/bibclassify/lib/bibclassify_acronym_analyzer.py
M		modules/bibclassify/lib/bibclassify_cli.py
M		modules/bibclassify/lib/bibclassify_config.py
M		modules/bibclassify/lib/bibclassify_daemon.py
M		modules/bibclassify/lib/bibclassify_engine.py
M		modules/bibclassify/lib/bibclassify_keyword_analyzer.py
A		modules/bibclassify/lib/bibclassify_microtests.py
M		modules/bibclassify/lib/bibclassify_ontology_reader.py
M		modules/bibclassify/lib/bibclassify_regression_tests.py
A		modules/bibclassify/lib/bibclassify_templates.py
A		modules/bibclassify/lib/bibclassify_tests.py
M		modules/bibclassify/lib/bibclassify_text_extractor.py
M		modules/bibclassify/lib/bibclassify_text_normalizer.py
D		modules/bibclassify/lib/bibclassify_utils.py
M		modules/bibclassify/lib/bibclassify_webinterface.py
M		modules/bibconvert/etc/Makefile.am
A		modules/bibconvert/etc/authorlist2marcxml.xsl
M		modules/bibconvert/etc/oaiarxiv2marcxml.xsl
M		modules/bibedit/bin/refextract.in
M		modules/bibedit/etc/Makefile.am
A		modules/bibedit/etc/refextract-job-preprints.cfg
M		modules/bibedit/lib/Makefile.am
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_menu.js
A		modules/bibedit/lib/bibedit_template_interface.js
M		modules/bibedit/lib/bibedit_templates.py
M		modules/bibedit/lib/bibedit_utils.py
M		modules/bibedit/lib/bibedit_webinterface.py
M		modules/bibedit/lib/bibeditmulti_templates.py
M		modules/bibedit/lib/bibrecord.py
M		modules/bibedit/lib/refextract.py
A		modules/bibedit/lib/refextract_cli.py
M		modules/bibedit/lib/refextract_config.py
A		modules/bibedit/lib/refextract_daemon.py
A	(dir)	modules/bibencode/
P		modules/bibencode/Makefile.am Copied from modules/bibauthorid/Makefile.am
A	(dir)	modules/bibencode/bin/
P		modules/bibencode/bin/Makefile.am Copied from modules/bibauthorid/Makefile.am
P		modules/bibencode/bin/bibencode.in Copied from modules/bibauthorid/Makefile.am
A	(dir)	modules/bibencode/etc/
P		modules/bibencode/etc/Makefile.am Copied from modules/bibauthorid/Makefile.am
A		modules/bibencode/etc/batch_template_new_formats.json
A		modules/bibencode/etc/batch_template_submission.json
A		modules/bibencode/etc/encoding_profiles.json
A		modules/bibencode/etc/extract_profiles.json
A		modules/bibencode/etc/pbcore_mappings.json
A		modules/bibencode/etc/pbcore_to_marc.xsl
A		modules/bibencode/etc/pbcore_to_marc_nons.xsl
A	(dir)	modules/bibencode/lib/
P		modules/bibencode/lib/Makefile.am Copied from modules/bibsched/lib/tasklets/Makefile.am
A		modules/bibencode/lib/bibencode.py
A		modules/bibencode/lib/bibencode_batch_engine.py
A		modules/bibencode/lib/bibencode_config.py
A		modules/bibencode/lib/bibencode_daemon.py
A		modules/bibencode/lib/bibencode_encode.py
A		modules/bibencode/lib/bibencode_extract.py
A		modules/bibencode/lib/bibencode_metadata.py
A		modules/bibencode/lib/bibencode_profiles.py
A		modules/bibencode/lib/bibencode_tester.py
A		modules/bibencode/lib/bibencode_utils.py
A		modules/bibencode/lib/bibencode_websubmit.js
A		modules/bibencode/lib/bibencode_websubmit.py
A	(dir)	modules/bibencode/www/
P		modules/bibencode/www/Makefile.am Copied from modules/bibsched/lib/tasklets/Makefile.am
A		modules/bibencode/www/default_avatar.png
A		modules/bibencode/www/mejs-invenio.css
A		modules/bibencode/www/mejs-invenio.js
A		modules/bibencode/www/video_platform_record.css
A		modules/bibencode/www/video_platform_record.js
M		modules/bibformat/etc/format_templates/Default_HTML_actions.bft
M		modules/bibformat/etc/format_templates/Default_HTML_detailed.bft
M		modules/bibformat/etc/format_templates/Excel.bft
M		modules/bibformat/etc/format_templates/Makefile.am
A		modules/bibformat/etc/format_templates/Video_HTML_brief.bft
A		modules/bibformat/etc/format_templates/Video_HTML_detailed.bft
M		modules/bibformat/etc/output_formats/HB.bfo
M		modules/bibformat/etc/output_formats/HD.bfo
A		modules/bibformat/etc/output_formats/UNTLD.bfo
M		modules/bibformat/lib/bibformat.py
M		modules/bibformat/lib/bibformat_bfx_engine.py
M		modules/bibformat/lib/bibformat_config.py
M		modules/bibformat/lib/bibformat_dblayer.py
M		modules/bibformat/lib/bibformat_engine.py
M		modules/bibformat/lib/bibformat_templates.py
M		modules/bibformat/lib/bibformat_utils.py
M		modules/bibformat/lib/bibformat_xslt_engine.py
M		modules/bibformat/lib/bibformatadminlib.py
M		modules/bibformat/lib/bibreformat.py
M		modules/bibformat/lib/elements/Makefile.am
M		modules/bibformat/lib/elements/bfe_aid_authors.py
M		modules/bibformat/lib/elements/bfe_bibtex.py
A		modules/bibformat/lib/elements/bfe_bookmark.py
M		modules/bibformat/lib/elements/bfe_comments.py
M		modules/bibformat/lib/elements/bfe_date.py
M		modules/bibformat/lib/elements/bfe_edit_record.py
M		modules/bibformat/lib/elements/bfe_fulltext.py
M		modules/bibformat/lib/elements/bfe_imprint.py
M		modules/bibformat/lib/elements/bfe_issn.py
M		modules/bibformat/lib/elements/bfe_keywords.py
M		modules/bibformat/lib/elements/bfe_notes.py
M		modules/bibformat/lib/elements/bfe_plots.py
P		modules/bibformat/lib/elements/bfe_record_url.py Copied from modules/webstyle/etc/Makefile.am
M		modules/bibformat/lib/elements/bfe_references.py
A		modules/bibformat/lib/elements/bfe_sciencewise.py
P		modules/bibformat/lib/elements/bfe_video_bigthumb.py Copied from modules/bibclassify/lib/Makefile.am
A		modules/bibformat/lib/elements/bfe_video_platform_downloads.py
A		modules/bibformat/lib/elements/bfe_video_platform_sources.py
A		modules/bibformat/lib/elements/bfe_video_platform_suggestions.py
A		modules/bibformat/lib/elements/bfe_video_selector.py
A		modules/bibformat/lib/elements/bfe_video_sources.py
M		modules/bibformat/web/admin/bibformatadmin.py
M		modules/bibharvest/lib/bibharvest_templates.py
M		modules/bibharvest/lib/oai_harvest_admin.py
M		modules/bibharvest/lib/oai_harvest_config.py
M		modules/bibharvest/lib/oai_harvest_daemon.py
M		modules/bibharvest/lib/oai_repository_server.py
M		modules/bibharvest/lib/oai_repository_updater.py
M		modules/bibindex/lib/bibindex_engine.py
M		modules/bibindex/lib/bibindex_engine_tests.py
M		modules/bibindex/lib/bibindex_engine_tokenizer.py
M		modules/bibindex/lib/bibindex_engine_tokenizer_tests.py
M		modules/bibknowledge/lib/bibknowledge.py
M		modules/bibknowledge/lib/bibknowledge_dblayer.py
M		modules/bibknowledge/lib/bibknowledge_regression_tests.py
M		modules/bibknowledge/lib/bibknowledge_templates.py
M		modules/bibknowledge/lib/bibknowledgeadmin.py
M		modules/bibmatch/doc/admin/bibmatch-admin-guide.webdoc
M		modules/bibmatch/lib/bibmatch_engine.py
M		modules/bibmatch/lib/bibmatch_regression_tests.py
M		modules/bibmerge/lib/bibmerge_engine.js
M		modules/bibmerge/lib/bibmerge_engine.py
M		modules/bibmerge/lib/bibmerge_templates.py
M		modules/bibmerge/lib/bibmerge_webinterface.py
M		modules/bibrank/etc/Makefile.am
P		modules/bibrank/etc/demo_itc_collection.cfg Copied from modules/webstyle/etc/Makefile.am
P		modules/bibrank/etc/template_index_term_count.cfg Copied from modules/webstyle/etc/Makefile.am
M		modules/bibrank/lib/bibrank.py
M		modules/bibrank/lib/bibrank_citation_indexer.py
M		modules/bibrank/lib/bibrank_downloads_similarity.py
M		modules/bibrank/lib/bibrank_grapher.py
M		modules/bibrank/lib/bibrank_tag_based_indexer.py
M		modules/bibsched/lib/bibsched.py
M		modules/bibsched/lib/bibtask.py
M		modules/bibsched/lib/bibtask_config.py
P		modules/bibsched/lib/tasklets/Makefile.am Copied to multiple locations: modules/bibauthorid/etc/name_authority_files/Makefile.am modules/bibclassify/etc/Makefile.am modules/bibencode/lib/Makefile.am modules/bibencode/www/Makefile.am modules/miscutil/lib/plotextractor_config.py
A		modules/bibsched/lib/tasklets/bst_twitter_fetcher.py
M		modules/bibsword/lib/bibsword_client_tester.py
M		modules/bibsword/lib/bibsword_webinterface.py
M		modules/bibupload/doc/admin/bibupload-admin-guide.webdoc
M		modules/bibupload/lib/batchuploader.py
M		modules/bibupload/lib/batchuploader_engine.py
M		modules/bibupload/lib/batchuploader_templates.py
M		modules/bibupload/lib/batchuploader_webinterface.py
M		modules/bibupload/lib/bibupload.py
M		modules/bibupload/lib/bibupload_regression_tests.py
M		modules/miscutil/demo/democfgdata.sql
M		modules/miscutil/etc/Makefile.am
A	(dir)	modules/miscutil/etc/ckeditor_scientificchar/
P		modules/miscutil/etc/ckeditor_scientificchar/Makefile.am Copied from modules/bibauthorid/Makefile.am
A		modules/miscutil/etc/ckeditor_scientificchar/ScientificChar.gif
A	(dir)	modules/miscutil/etc/ckeditor_scientificchar/dialogs/
P		modules/miscutil/etc/ckeditor_scientificchar/dialogs/Makefile.am Copied from modules/bibauthorid/Makefile.am
A		modules/miscutil/etc/ckeditor_scientificchar/dialogs/scientificchar.js
A	(dir)	modules/miscutil/etc/ckeditor_scientificchar/lang/
P		modules/miscutil/etc/ckeditor_scientificchar/lang/Makefile.am Copied from modules/bibauthorid/Makefile.am
A		modules/miscutil/etc/ckeditor_scientificchar/lang/en.js
A		modules/miscutil/etc/ckeditor_scientificchar/lang/fr.js
A		modules/miscutil/etc/ckeditor_scientificchar/plugin.js
M		modules/miscutil/lib/dbquery.py
M		modules/miscutil/lib/htmlutils.py
M		modules/miscutil/lib/htmlutils_tests.py
M		modules/miscutil/lib/invenio_connector.py
M		modules/miscutil/lib/invenio_connector_regression_tests.py
M		modules/miscutil/lib/inveniocfg.py
M		modules/miscutil/lib/kwalitee.py
M		modules/miscutil/lib/messages.py
M		modules/miscutil/lib/messages_tests.py
M		modules/miscutil/lib/plotextractor.py
P		modules/miscutil/lib/plotextractor_config.py Copied from modules/bibsched/lib/tasklets/Makefile.am
M		modules/miscutil/lib/plotextractor_getter.py
M		modules/miscutil/lib/remote_debugger.py
M		modules/miscutil/lib/testutils.py
M		modules/miscutil/lib/textutils.py
M		modules/miscutil/lib/textutils_tests.py
M		modules/miscutil/sql/tabcreate.sql
M		modules/miscutil/sql/tabdrop.sql
M		modules/miscutil/sql/tabfill.sql
M		modules/webaccess/lib/access_control_config.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_config.py
M		modules/webbasket/lib/webbasket_dblayer.py
M		modules/webbasket/lib/webbasket_templates.py
M		modules/webbasket/lib/webbasket_webinterface.py
M		modules/webcomment/doc/admin/webcomment-admin-guide.webdoc
M		modules/webcomment/lib/webcomment.py
M		modules/webcomment/lib/webcomment_config.py
M		modules/webcomment/lib/webcomment_templates.py
M		modules/webcomment/lib/webcomment_washer.py
M		modules/webcomment/lib/webcomment_webinterface.py
M		modules/webcomment/lib/webcommentadminlib.py
M		modules/webcomment/web/admin/webcommentadmin.py
M		modules/webhelp/web/hacking/Makefile.am
A		modules/webhelp/web/hacking/ckeditor.webdoc
D		modules/webhelp/web/hacking/fckeditor.webdoc
M		modules/webjournal/etc/AtlantisTimes.css
M		modules/webjournal/lib/elements/bfe_webjournal_main_navigation.py
M		modules/webjournal/lib/webjournal_webinterface.py
M		modules/webjournal/lib/widgets/bfe_webjournal_widget_whatsNew.py
M		modules/webmessage/lib/webmessage.py
M		modules/webmessage/lib/webmessage_config.py
M		modules/websearch/doc/search-guide.webdoc
M		modules/websearch/doc/search-tips.webdoc
M		modules/websearch/lib/Makefile.am
M		modules/websearch/lib/search_engine.py
M		modules/websearch/lib/search_engine_query_parser.py
M		modules/websearch/lib/search_engine_query_parser_tests.py
A		modules/websearch/lib/search_engine_utils.py
M		modules/websearch/lib/websearch_external_collections.py
M		modules/websearch/lib/websearch_external_collections_config.py
M		modules/websearch/lib/websearch_external_collections_parser.py
M		modules/websearch/lib/websearch_external_collections_searcher.py
M		modules/websearch/lib/websearch_external_collections_templates.py
M		modules/websearch/lib/websearch_regression_tests.py
M		modules/websearch/lib/websearch_templates.py
A		modules/websearch/lib/websearch_web_tests.py
M		modules/websearch/lib/websearch_webcoll.py
M		modules/websearch/lib/websearch_webinterface.py
M		modules/websearch/lib/websearchadminlib.py
M		modules/websearch/web/Makefile.am
D		modules/websearch/web/test_search_ellis.html
M		modules/websession/lib/inveniogc.py
M		modules/websession/lib/webgroup.py
M		modules/websession/lib/websession_config.py
M		modules/websession/lib/websession_templates.py
M		modules/websession/lib/websession_webinterface.py
M		modules/webstat/lib/webstat_engine.py
M		modules/webstat/lib/webstat_templates.py
M		modules/webstyle/css/invenio.css
M		modules/webstyle/doc/hacking/webstyle-webdoc-syntax.webdoc
P		modules/webstyle/etc/Makefile.am Copied to multiple locations: modules/bibformat/lib/elements/bfe_record_url.py modules/bibrank/etc/demo_itc_collection.cfg modules/bibrank/etc/template_index_term_count.cfg
A		modules/webstyle/etc/invenio-ckeditor-config.js
A		modules/webstyle/etc/invenio-ckeditor-content.css
D		modules/webstyle/etc/invenio-fckeditor-config.js
M		modules/webstyle/etc/journal-editor-config.js
A		modules/webstyle/etc/journal-editor-styles.js
D		modules/webstyle/etc/journal-editor-styles.xml
A		modules/webstyle/etc/journal-editor-templates.js
D		modules/webstyle/etc/journal-editor-templates.xml
M		modules/webstyle/img/Makefile.am
A		modules/webstyle/img/page_edit.png
A		modules/webstyle/img/sciencewise.png
M		modules/webstyle/lib/Makefile.am
A		modules/webstyle/lib/ckeditor_invenio_connector.py
D		modules/webstyle/lib/fckeditor_invenio_connector.py
M		modules/webstyle/lib/webinterface_handler.py
M		modules/webstyle/lib/webinterface_handler_wsgi.py
M		modules/webstyle/lib/webinterface_handler_wsgi_utils.py
M		modules/webstyle/lib/webinterface_layout.py
M		modules/webstyle/lib/webstyle_templates.py
M		modules/websubmit/doc/admin/websubmit-admin-guide.webdoc
A		modules/websubmit/etc/DEMOVID.tpl
A		modules/websubmit/etc/DEMOVIDcreate.tpl
A		modules/websubmit/etc/DEMOVIDmodify.tpl
M		modules/websubmit/etc/Makefile.am
M		modules/websubmit/lib/bibdocfile.py
M		modules/websubmit/lib/bibdocfilecli.py
A		modules/websubmit/lib/functions/DEMOVID_Validation.py
M		modules/websubmit/lib/functions/Mail_Approval_Request_to_Committee_Chair.py
M		modules/websubmit/lib/functions/Makefile.am
V		modules/websubmit/lib/functions/{Move_CKEditor_Files_to_Storage.py ← Move_FCKeditor_Files_to_Storage.py}
V		modules/websubmit/lib/functions/{Move_FCKeditor_Files_to_Storage.py → Move_CKEditor_Files_to_Storage.py}
M		modules/websubmit/lib/functions/Move_Photos_to_Storage.py
M		modules/websubmit/lib/functions/User_is_Record_Owner_or_Curator.py
A		modules/websubmit/lib/functions/Video_Processing.py
M		modules/websubmit/lib/websubmit_config.py
M		modules/websubmit/lib/websubmit_engine.py
M		modules/websubmit/lib/websubmit_file_converter.py
M		modules/websubmit/lib/websubmit_managedocfiles.py
M		modules/websubmit/lib/websubmit_templates.py
M		modules/websubmit/lib/websubmit_webinterface.py
M		modules/websubmit/lib/websubmitadmin_config.py
M		modules/websubmit/lib/websubmitadmin_dblayer.py
M		modules/websubmit/lib/websubmitadmin_engine.py
M		modules/websubmit/web/admin/websubmitadmin.py
M		modules/websubmit/web/publiline.py
M		po/LINGUAS
A		po/ar.po

Merge branch 'master' into next45a7fa3381b5Actions

Description

Details

Event Timeline

Merged Changes

Changes (334)Show All Changes

Very Large Commit

R3600:45a7fa3381b5

.gitignore

ABOUT-NLS

INSTALL

Makefile.am

THANKS

config/invenio-autotools.conf.in

config/invenio.conf

configure-tests.py

configure.ac

modules/Makefile.am

modules/bibauthorid/Makefile.am

modules/bibauthorid/etc/Makefile.am

modules/bibauthorid/etc/name_authority_files/Makefile.am

modules/bibauthorid/lib/bibauthorid.py

modules/bibauthorid/lib/bibauthorid_authorname_utils.py

modules/bibauthorid/lib/bibauthorid_cli.py

modules/bibauthorid/lib/bibauthorid_comparison_functions/aid_cmp_affiliations.py

modules/bibauthorid/lib/bibauthorid_comparison_functions/aid_cmp_coauthorship.py

modules/bibauthorid/lib/bibauthorid_comparison_functions/aid_cmp_inspireids.py

modules/bibauthorid/lib/bibauthorid_comparison_functions/aid_cmp_topcites.py

modules/bibauthorid/lib/bibauthorid_config.py

modules/bibauthorid/lib/bibauthorid_daemon.py

modules/bibauthorid/lib/bibauthorid_personid_tables_utils.py

modules/bibauthorid/lib/bibauthorid_realauthor_utils.py

modules/bibauthorid/lib/bibauthorid_structs.py

modules/bibauthorid/lib/bibauthorid_tables_utils.py

modules/bibauthorid/lib/bibauthorid_templates.py

modules/bibauthorid/lib/bibauthorid_tests.py

modules/bibauthorid/lib/bibauthorid_utils.py

modules/bibauthorid/lib/bibauthorid_virtualauthor_utils.py

modules/bibauthorid/lib/bibauthorid_webapi.py

modules/bibauthorid/lib/bibauthorid_webinterface.py

modules/bibcatalog/lib/bibcatalog_system.py

modules/bibcatalog/lib/bibcatalog_system_rt.py

modules/bibcirculation/lib/bibcirculation_templates.py

modules/bibcirculation/lib/bibcirculation_utils.py

modules/bibclassify/Makefile.am

modules/bibclassify/doc/admin/bibclassify-admin-guide.webdoc

modules/bibclassify/etc/Makefile.am

modules/bibclassify/etc/microtests.cfg

modules/bibclassify/etc/test.rdf

modules/bibclassify/lib/Makefile.am

modules/bibclassify/lib/bibclassify_acronym_analyzer.py

modules/bibclassify/lib/bibclassify_cli.py

modules/bibclassify/lib/bibclassify_config.py

modules/bibclassify/lib/bibclassify_daemon.py

modules/bibclassify/lib/bibclassify_engine.py

modules/bibclassify/lib/bibclassify_keyword_analyzer.py

modules/bibclassify/lib/bibclassify_microtests.py

modules/bibclassify/lib/bibclassify_ontology_reader.py

modules/bibclassify/lib/bibclassify_regression_tests.py

modules/bibclassify/lib/bibclassify_templates.py

modules/bibclassify/lib/bibclassify_tests.py

modules/bibclassify/lib/bibclassify_text_extractor.py

modules/bibclassify/lib/bibclassify_text_normalizer.py

modules/bibclassify/lib/bibclassify_utils.py

modules/bibclassify/lib/bibclassify_webinterface.py

modules/bibconvert/etc/Makefile.am

modules/bibconvert/etc/authorlist2marcxml.xsl

modules/bibconvert/etc/oaiarxiv2marcxml.xsl

modules/bibedit/bin/refextract.in

modules/bibedit/etc/Makefile.am

modules/bibedit/etc/refextract-job-preprints.cfg

modules/bibedit/lib/Makefile.am

modules/bibedit/lib/bibedit_display.js

modules/bibedit/lib/bibedit_engine.js

modules/bibedit/lib/bibedit_engine.py

modules/bibedit/lib/bibedit_menu.js

modules/bibedit/lib/bibedit_template_interface.js

modules/bibedit/lib/bibedit_templates.py

modules/bibedit/lib/bibedit_utils.py

modules/bibedit/lib/bibedit_webinterface.py

Merge branch 'master' into next
45a7fa3381b5
Actions

Changes (334)
Show All Changes