Diffusion invenio-infoscience 1a49245d0c1d

Merge branch 'master' into next
1a49245d0c1d
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 2 2012, 09:54.

Description

Merge branch 'master' into next

master: (51 commits) WebSearch: use wildcard limit in web APIs only WebSession: forward compatibility with Flask BibEditMulti: change loading gif and center it BibEditMulti: improve action apply performance BibEditMulti: allow empty string replacement BibEditMulti: filter tags with indicators BibEditMulti: wider search box and placeholder WebSubmit: fix demo book submission web test case WebComment: tear down after web tests WebSession: tear down after web tests BibHarvest: tear down after web tests WebSearch: better primary collection guessing BibHarvest: adapt web tests to the new framework WebSubmit: adapt web tests to the new framework WebSession: adapt web test to the new framework WebJournal: adapt web tests to the new framework WebComment: adapt web tests to the new framework BibFormat: adapt web tests to the new framework WebAlert: adapt web tests to the new framework BibFormat: adapt tests to ignore revision tag 005 ...

Merge notes: kept jQuery parts as they were in next. The jQuery version will have to be updated anyway.

Conflicts:
Makefile.am
modules/bibcirculation/lib/bibcirculation_templates.py
modules/bibedit/lib/bibedit_engine.py
modules/bibedit/lib/bibedit_keys.js
modules/bibharvest/lib/bibharvest_templates.py
modules/websearch/lib/search_engine.py
modules/websubmit/lib/functions/Move_Photos_to_Storage.py
po/ca.po
po/es.po

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 2 2012, 09:55

Parents

R3600:89f7509cf300: WebSearch: use wildcard limit in web APIs only
R3600:72cbe8f15d80: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:1a49245d0c1d: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 2 2012, 09:55

Merged Changes

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

Commit	Author	Details	Committed
89f7509cf300	Ludmila Marian/Tibor Simko	WebSearch: use wildcard limit in web APIs only	Feb 1 2012
781d9cdf34d3	Samuele Kaplun/Tibor Simko	WebSession: forward compatibility with Flask	Feb 1 2012
673a82e4f062	Javier Martin/Tibor Simko	BibEditMulti: change loading gif and center it	Feb 1 2012
d37666899516	Javier Martin/Tibor Simko	BibEditMulti: improve action apply performance	Feb 1 2012
64086a5faa52	Javier Martin/Tibor Simko	BibEditMulti: allow empty string replacement	Feb 1 2012
14f7735b3a18	Javier Martin/Tibor Simko	BibEditMulti: filter tags with indicators	Feb 1 2012
601ebd6cbb91	Javier Martin/Tibor Simko	BibEditMulti: wider search box and placeholder	Feb 1 2012
e5cd50b4c93e	Raquel Jimenez Encinar/Tibor Simko	WebSubmit: fix demo book submission web test case	Feb 1 2012
dd46ebeecfd8	Raquel Jimenez Encinar/Tibor Simko	WebComment: tear down after web tests	Feb 1 2012
7f966e2df86c	Raquel Jimenez Encinar/Tibor Simko	WebSession: tear down after web tests	Feb 1 2012
9b4777ac5219	Raquel Jimenez Encinar/Tibor Simko	BibHarvest: tear down after web tests	Feb 1 2012
c355981bb88c	Jan Aage Lavik/Tibor Simko	WebSearch: better primary collection guessing	Feb 1 2012
82b7aee42140	Raquel Jimenez Encinar/Tibor Simko	BibHarvest: adapt web tests to the new framework	Jan 31 2012
fc5cf7b18ff7	Raquel Jimenez Encinar/Tibor Simko	WebSubmit: adapt web tests to the new framework	Jan 31 2012
e02b8cea2240	Raquel Jimenez Encinar/Tibor Simko	WebSession: adapt web test to the new framework	Jan 31 2012
f8a3000fada0	Raquel Jimenez Encinar/Tibor Simko	WebJournal: adapt web tests to the new framework	Jan 31 2012
ae1d7f47f528	Raquel Jimenez Encinar/Tibor Simko	WebComment: adapt web tests to the new framework	Jan 31 2012
01d7088ad691	Raquel Jimenez Encinar/Tibor Simko	BibFormat: adapt web tests to the new framework	Jan 31 2012
bf4c32010527	Raquel Jimenez Encinar/Tibor Simko	WebAlert: adapt web tests to the new framework	Jan 31 2012
e720fb65083f	Tibor Simko	BibFormat: adapt tests to ignore revision tag 005	Jan 30 2012
70f76183f018	Vasanth Venkatraman/Tibor Simko	BibUpload: automatic generation of MARC tag 005	Jan 30 2012
cf792fc4672e	Ferran Jorba/Tibor Simko	I18N: updates to Catalan and Spanish translations	Jan 30 2012
bf13b181127f	Ferran Jorba/Tibor Simko	I18N: differentiate long and short form of May	Jan 30 2012
830df27c7af4	Jerome Caffaro/Tibor Simko	WebSubmit: CERN hack concerning hidden formats	Jan 30 2012
79695cc02726	Jerome Caffaro/Tibor Simko	BibFormat: update sample RTMP streamer URL	Jan 30 2012
917902f58910	Raquel Jimenez Encinar/Tibor Simko	demo site: standardise MARC	Jan 25 2012
8de19278cff2	Jerome Caffaro/Tibor Simko	WebBasket: fix MARCXML creation for external items	Jan 25 2012
60a91b12630b	Jay Luker/Tibor Simko	remote debugger: fix typo in CFG_DEVEL_SITE	Jan 25 2012
ddb23a54e186	Jerome Caffaro/Tibor Simko	WebComment: fix display of threads > 1 level	Jan 24 2012
b254a786834a	Jerome Caffaro/Tibor Simko	WebComment: add permalink to comments	Jan 24 2012
1b56c1c3b087	Jerome Caffaro/Tibor Simko	WebComment: improve HTML markup	Jan 24 2012
9062fdf6197d	Jerome Caffaro/Tibor Simko	WebStyle: improve markup of detailed record container	Jan 24 2012
283c75a902c8	Jerome Caffaro/Tibor Simko	htmlutils: fix rich text editor markup	Jan 24 2012
6e2ce246231d	Javier Martin/Tibor Simko	BibAuthorID: avoid JS files in author pages	Jan 24 2012
38fd35c15ebf	Javier Martin/Tibor Simko	installation: update to jQuery 1.7.1 and UI 1.8.17	Jan 24 2012
4ef0b675d08d	Joe Blaylock/Tibor Simko	WebSearch: add abbreviations for topcite	Jan 24 2012
212e1396f7bd	Roman Chyla/Tibor Simko	BibClassify: fix typo in regression test	Jan 24 2012
6660814dc3c3	Tibor Simko	WebSearch: remove Report for INSPIRE author pages	Jan 24 2012
c377b404e2ae	Jerome Caffaro/Tibor Simko	WebJournal: fix seminar widget for new Indico APIs	Jan 24 2012
db7a9d97fd9c	Jerome Caffaro/Tibor Simko	urlutils: new Indico request generator helper	Jan 24 2012
4616e788b6bd	Jerome Caffaro/Tibor Simko	WebSubmit: fix dir creation in async file upload	Jan 24 2012
56f9388e0434	Javier Martin/Tibor Simko	BibEdit: fix hotkeys on input fields	Jan 23 2012
b79152fa368c	Javier Martin/Tibor Simko	BibEdit: fix return binding and shortcut changes	Jan 23 2012
6cf00d4a7d9f	Javier Martin/Tibor Simko	BibEdit: adapt bibedit_keys.js to new library	Jan 23 2012
eb275338b6ab	Javier Martin/Tibor Simko	installation: update to jQuery 1.5.2 and UI 1.8.16	Jan 23 2012
16963a109af0	Tibor Simko	BibUpload: fix FMT uploading	Jan 23 2012
a8ce9c6d3c3f	Samuele Kaplun/Tibor Simko	BibSched: add doc for task_low_level_submission	Jan 20 2012
ee0ec2acabf9	Samuele Kaplun/Tibor Simko	bibdocfile: add bibdocfile_url_p regression test	Jan 20 2012
de9c9d55e255	Alessio Deiana/Tibor Simko	WebSearch: use author IDs in self-cite math	Jan 20 2012
61ecf087c4cd	Tibor Simko	BibUpload: remove selected formats upon uploading	Jan 20 2012

Changes (98)

				Path
	M			Makefile.am
	M			config/invenio.conf
	M			modules/bibauthorid/lib/bibauthorid_dbinterface.py
	M			modules/bibauthorid/lib/bibauthorid_templates.py
	M			modules/bibcirculation/lib/bibcirculation_templates.py
	M			modules/bibclassify/lib/bibclassify_regression_tests.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/bibeditmulti.js
	M			modules/bibedit/lib/bibeditmulti_engine.py
	M			modules/bibedit/lib/bibeditmulti_templates.py
	M			modules/bibedit/lib/bibrecord_tests.py
	M			modules/bibformat/etc/format_templates/Podcast.xsl
	M			modules/bibformat/lib/Makefile.am
	M			modules/bibformat/lib/bibformat_regression_tests.py
	A			modules/bibformat/lib/bibformat_web_tests.py
	M			modules/bibformat/lib/elements/bfe_doi.py
	M			modules/bibformat/lib/elements/bfe_publi_info.py
	M			modules/bibformat/web/Makefile.am
	D			modules/bibformat/web/test_format_many_authors.html
	M			modules/bibharvest/lib/Makefile.am
	M			modules/bibharvest/lib/bibharvest_templates.py
	A			modules/bibharvest/lib/bibharvest_web_tests.py
	M			modules/bibharvest/web/Makefile.am
	D			modules/bibharvest/web/test_insert_oai_source.html
	M			modules/bibsched/doc/hacking/bibtask-api.webdoc
	M			modules/bibupload/lib/batchuploader_templates.py
	M			modules/bibupload/lib/bibupload.py
	M			modules/bibupload/lib/bibupload_regression_tests.py
	M			modules/miscutil/demo/demobibdata.xml
	M			modules/miscutil/lib/dateutils.py
	M			modules/miscutil/lib/htmlutils.py
	M			modules/miscutil/lib/inveniocfg.py
	M			modules/miscutil/lib/remote_debugger_config.py
	M			modules/miscutil/lib/testutils.py
	M			modules/miscutil/lib/urlutils.py
	M			modules/miscutil/lib/urlutils_tests.py
	M			modules/miscutil/sql/tabcreate.sql
	M			modules/miscutil/sql/tabfill.sql
	M			modules/webalert/lib/Makefile.am
	A			modules/webalert/lib/webalert_web_tests.py
	M			modules/webalert/web/Makefile.am
	D			modules/webalert/web/test_alert_add.html
	D			modules/webalert/web/test_alert_addbasket.html
	D			modules/webalert/web/test_alert_yoursearches.html
	M			modules/webbasket/lib/webbasket_dblayer.py
	M			modules/webcomment/lib/Makefile.am
	M			modules/webcomment/lib/webcomment_templates.py
	A			modules/webcomment/lib/webcomment_web_tests.py
	M			modules/webcomment/web/Makefile.am
	D			modules/webcomment/web/test_comment_add.html
	D			modules/webcomment/web/test_comment_deletereport.html
	D			modules/webcomment/web/test_review_add.html
	M			modules/webjournal/lib/Makefile.am
	A			modules/webjournal/lib/webjournal_web_tests.py
	M			modules/webjournal/lib/widgets/bfe_webjournal_widget_seminars.py
	M			modules/webjournal/web/Makefile.am
	D			modules/webjournal/web/test_journal_adminrestrictions.html
	M			modules/websearch/doc/citation-metrics.webdoc
	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
	M			modules/websearch/lib/search_engine_summarizer.py
	M			modules/websearch/lib/search_engine_summarizer_tests.py
	M			modules/websearch/lib/websearch_regression_tests.py
	M			modules/websearch/lib/websearch_templates.py
	M			modules/websearch/lib/websearch_webinterface.py
	M			modules/websession/lib/Makefile.am
	M			modules/websession/lib/inveniogc.py
	M			modules/websession/lib/session.py
	A			modules/websession/lib/websession_web_tests.py
	M			modules/websession/web/Makefile.am
	D			modules/websession/web/test_group_create.html
	D			modules/websession/web/test_group_msg.html
	D			modules/websession/web/test_group_open.html
	D			modules/websession/web/test_group_set.html
	M			modules/webstat/lib/webstat_templates.py
	M			modules/webstyle/css/invenio.css
	M			modules/webstyle/img/Makefile.am
	A			modules/webstyle/img/ajax-loader.gif
	M			modules/webstyle/lib/webstyle_templates.py
	M			modules/websubmit/lib/Makefile.am
	M			modules/websubmit/lib/bibdocfile_regression_tests.py
	M			modules/websubmit/lib/functions/Move_Photos_to_Storage.py
	M			modules/websubmit/lib/websubmit_managedocfiles.py
	A			modules/websubmit/lib/websubmit_web_tests.py
	M			modules/websubmit/lib/websubmit_webinterface.py
	M			modules/websubmit/web/Makefile.am
	D			modules/websubmit/web/test_submit_article.html
	D			modules/websubmit/web/test_submit_book.html
	D			modules/websubmit/web/test_submit_book_approval.html
	D			modules/websubmit/web/test_submit_journal.html
	D			modules/websubmit/web/test_submit_poetry.html
	D			modules/websubmit/web/test_submit_tar_gz.html
	M			po/ca.po
	M			po/es.po

Merge branch 'master' into next1a49245d0c1dActions

Description

Details

Event Timeline

Merged Changes

Changes (98)

R3600:1a49245d0c1d

Makefile.am

config/invenio.conf

modules/bibauthorid/lib/bibauthorid_dbinterface.py

modules/bibauthorid/lib/bibauthorid_templates.py

modules/bibcirculation/lib/bibcirculation_templates.py

modules/bibclassify/lib/bibclassify_regression_tests.py

modules/bibedit/lib/bibedit_display.js

modules/bibedit/lib/bibedit_engine.js

modules/bibedit/lib/bibedit_engine.py

modules/bibedit/lib/bibedit_keys.js

modules/bibedit/lib/bibeditmulti.js

modules/bibedit/lib/bibeditmulti_engine.py

modules/bibedit/lib/bibeditmulti_templates.py

modules/bibedit/lib/bibrecord_tests.py

modules/bibformat/etc/format_templates/Podcast.xsl

modules/bibformat/lib/Makefile.am

modules/bibformat/lib/bibformat_regression_tests.py

modules/bibformat/lib/bibformat_web_tests.py

modules/bibformat/lib/elements/bfe_doi.py

modules/bibformat/lib/elements/bfe_publi_info.py

modules/bibformat/web/Makefile.am

modules/bibformat/web/test_format_many_authors.html

modules/bibharvest/lib/Makefile.am

modules/bibharvest/lib/bibharvest_templates.py

modules/bibharvest/lib/bibharvest_web_tests.py

modules/bibharvest/web/Makefile.am

modules/bibharvest/web/test_insert_oai_source.html

modules/bibsched/doc/hacking/bibtask-api.webdoc

modules/bibupload/lib/batchuploader_templates.py

modules/bibupload/lib/bibupload.py

modules/bibupload/lib/bibupload_regression_tests.py

modules/miscutil/demo/demobibdata.xml

modules/miscutil/lib/dateutils.py

modules/miscutil/lib/htmlutils.py

modules/miscutil/lib/inveniocfg.py

modules/miscutil/lib/remote_debugger_config.py

modules/miscutil/lib/testutils.py

modules/miscutil/lib/urlutils.py

modules/miscutil/lib/urlutils_tests.py

modules/miscutil/sql/tabcreate.sql

modules/miscutil/sql/tabfill.sql

modules/webalert/lib/Makefile.am

modules/webalert/lib/webalert_web_tests.py

modules/webalert/web/Makefile.am

modules/webalert/web/test_alert_add.html

modules/webalert/web/test_alert_addbasket.html

modules/webalert/web/test_alert_yoursearches.html

modules/webbasket/lib/webbasket_dblayer.py

modules/webcomment/lib/Makefile.am

modules/webcomment/lib/webcomment_templates.py

modules/webcomment/lib/webcomment_web_tests.py

modules/webcomment/web/Makefile.am

modules/webcomment/web/test_comment_add.html

modules/webcomment/web/test_comment_deletereport.html

modules/webcomment/web/test_review_add.html

modules/webjournal/lib/Makefile.am

modules/webjournal/lib/webjournal_web_tests.py

modules/webjournal/lib/widgets/bfe_webjournal_widget_seminars.py

modules/webjournal/web/Makefile.am

modules/webjournal/web/test_journal_adminrestrictions.html

modules/websearch/doc/citation-metrics.webdoc

modules/websearch/lib/search_engine.py

modules/websearch/lib/search_engine_query_parser.py

modules/websearch/lib/search_engine_query_parser_tests.py

modules/websearch/lib/search_engine_summarizer.py

modules/websearch/lib/search_engine_summarizer_tests.py

modules/websearch/lib/websearch_regression_tests.py

modules/websearch/lib/websearch_templates.py

modules/websearch/lib/websearch_webinterface.py

modules/websession/lib/Makefile.am

modules/websession/lib/inveniogc.py

modules/websession/lib/session.py

modules/websession/lib/websession_web_tests.py

Merge branch 'master' into next
1a49245d0c1d
Actions