Diffusion invenio-infoscience c2cd5c312d4b

Merge branch 'master' into next
c2cd5c312d4b
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on May 18 2011, 17:07.

Description

Merge branch 'master' into next

master: global: /record configurable via CFG_SITE_RECORD I18N: adds missing new files to POTFILES.in

Conflicts:
modules/bibedit/lib/bibedit_engine.js

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

May 18 2011, 17:07

Parents

R3600:f13d432c658f: global: /record configurable via CFG_SITE_RECORD
R3600:0e29422aadba: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:c2cd5c312d4b: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).May 18 2011, 17:07

Merged Changes

	Commit			Author	Details	Committed
	f13d432c658f			Peter Halliday/Tibor Simko	global: /record configurable via CFG_SITE_RECORD	May 18 2011
	6b203be8fd5d			Tibor Simko	I18N: adds missing new files to POTFILES.in	May 17 2011

Changes (80)

				Path
	M			config/invenio.conf
	M			modules/bibcirculation/lib/bibcirculation_templates.py
	M			modules/bibcirculation/lib/bibcirculation_webinterface.py
	M			modules/bibclassify/doc/admin/bibclassify-admin-guide.webdoc
	M			modules/bibedit/doc/admin/bibedit-admin-guide.webdoc
	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_webinterface.py
	M			modules/bibedit/lib/bibeditmulti_templates.py
	M			modules/bibexport/lib/bibexport_method_sitemap.py
	M			modules/bibformat/etc/format_templates/Default_HTML_actions.bft
	M			modules/bibformat/etc/format_templates/Default_HTML_similarity.bft
	M			modules/bibformat/lib/bibformat.py
	M			modules/bibformat/lib/bibformat_regression_tests.py
	M			modules/bibformat/lib/elements/bfe_edit_record.py
	M			modules/bibformat/lib/elements/bfe_fulltext.py
	M			modules/bibformat/lib/elements/bfe_fulltext_mini.py
	M			modules/bibformat/lib/elements/bfe_photo_resources_brief.py
	M			modules/bibformat/lib/elements/bfe_plots.py
	M			modules/bibformat/lib/elements/bfe_server_info.py
	M			modules/bibharvest/lib/oai_harvest_admin.py
	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_webinterface.py
	M			modules/bibrank/lib/bibrank_regression_tests.py
	M			modules/bibsword/lib/bibsword_client_templates.py
	M			modules/bibupload/lib/bibupload_regression_tests.py
	M			modules/miscutil/lib/invenio_connector.py
	M			modules/miscutil/lib/inveniocfg.py
	M			modules/webaccess/lib/access_control_config.py
	M			modules/webalert/lib/webalert_templates.py
	M			modules/webbasket/lib/webbasket_templates.py
	M			modules/webcomment/lib/webcomment.py
	M			modules/webcomment/lib/webcomment_regression_tests.py
	M			modules/webcomment/lib/webcomment_templates.py
	M			modules/webcomment/lib/webcomment_webinterface.py
	M			modules/webhelp/web/admin/admin.webdoc
	M			modules/webhelp/web/admin/howto/howto-fulltext.webdoc
	M			modules/webhelp/web/hacking/fckeditor.webdoc
	M			modules/webjournal/lib/elements/bfe_webjournal_article_admin_links.py
	M			modules/webjournal/lib/webjournal_templates.py
	M			modules/webjournal/lib/webjournaladminlib.py
	M			modules/webjournal/lib/widgets/bfe_webjournal_widget_featureRecord.py
	M			modules/webjournal/lib/widgets/bfe_webjournal_widget_latestPhoto.py
	M			modules/websearch/doc/admin/websearch-admin-guide.webdoc
	M			modules/websearch/lib/search_engine.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/websearch/lib/websearchadminlib.py
	M			modules/websession/lib/webaccount.py
	M			modules/websession/lib/websession_templates.py
	M			modules/websession/lib/webuser.py
	M			modules/webstat/lib/webstatadmin.py
	M			modules/webstyle/doc/admin/webstyle-admin-guide.webdoc
	M			modules/webstyle/lib/fckeditor_invenio_connector.py
	M			modules/webstyle/lib/webdoc.py
	M			modules/webstyle/lib/webinterface_handler.py
	M			modules/websubmit/doc/admin/websubmit-admin-guide.webdoc
	M			modules/websubmit/lib/bibdocfile.py
	M			modules/websubmit/lib/bibdocfile_regression_tests.py
	M			modules/websubmit/lib/bibdocfilecli.py
	M			modules/websubmit/lib/functions/Mail_Approval_Request_to_Committee_Chair.py
	M			modules/websubmit/lib/functions/Mail_Approval_Request_to_Referee.py
	M			modules/websubmit/lib/functions/Mail_New_Record_Notification.py
	M			modules/websubmit/lib/functions/Mail_Submitter.py
	M			modules/websubmit/lib/functions/Move_FCKeditor_Files_to_Storage.py
	M			modules/websubmit/lib/functions/Send_APP_Mail.py
	M			modules/websubmit/lib/functions/Send_Approval_Request.py
	M			modules/websubmit/lib/functions/Send_Modify_Mail.py
	M			modules/websubmit/lib/functions/Send_Request_For_Direct_Approval.py
	M			modules/websubmit/lib/functions/Send_Request_For_Publication.py
	M			modules/websubmit/lib/functions/Send_Request_For_Refereeing_Process.py
	M			modules/websubmit/lib/functions/Send_SRV_Mail.py
	M			modules/websubmit/lib/websubmit_templates.py
	M			modules/websubmit/lib/websubmit_webinterface.py
	M			modules/websubmit/web/publiline.py
	M			po/POTFILES.in