Diffusion invenio-infoscience c43cb7f665ed

Merge branch 'master' into next
c43cb7f665ed
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 31 2012, 16:50.

Description

Merge branch 'master' into next

master: (22 commits) bibdocfile: Python-2.4 compatibility fix WebSession: loginUser() fixes WebSession: table lock workaround for MySQL-5.5 urlutils: redirect_to_url() user agent fix BibFormat: new configuration of full-text snippets BibUpload: URL download HTTP header enhancement bibdocfile: possibility to enforce creation time WebSubmit: always kill LibreOffice in unoconv I18N: updates to German translation inveniogc: tmp-shared clean-up during GC WebAlert: fine-grained record restriction check WebAuthorProfile: JSON fix WebAuthorProfile: template fixes WebAuthorProfile: cache_not_ready barriers BibFormat: WAPAFF template fix WebAuthorProfile: author name link escape fix WebAuthorProfile: small fix WebAuthorProfile: some dirty fixes WebAuthorProfile: handful of fixes WebStyle: WebInterfaceAuthorPages exports removal ...

Conflicts:
modules/Makefile.am
modules/bibsched/lib/bibtask_config.py
modules/miscutil/sql/tabbibclean.sql
modules/miscutil/sql/tabdrop.sql
modules/webstyle/lib/webinterface_layout.py
po/de.po

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 31 2012, 16:50

Parents

R3600:846315410092: bibdocfile: Python-2.4 compatibility fix
R3600:3f5d2c8f4924: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:c43cb7f665ed: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 31 2012, 16:50

Merged Changes

Commit	Author	Details	Committed
846315410092	Ludmila Marian/Tibor Simko	bibdocfile: Python-2.4 compatibility fix	Aug 31 2012
c6ad1ece4870	Samuele Kaplun/Tibor Simko	WebSession: loginUser() fixes	Aug 31 2012
512ec7b59fc2	Samuele Kaplun/Tibor Simko	WebSession: table lock workaround for MySQL-5.5	Aug 31 2012
2a6ac0266069	Samuele Kaplun/Tibor Simko	urlutils: redirect_to_url() user agent fix	Aug 31 2012
fec0eb253059	Jan Iwaszkiewicz/Tibor Simko	BibFormat: new configuration of full-text snippets	Aug 31 2012
30dc77136404	Ludmila Marian/Tibor Simko	BibUpload: URL download HTTP header enhancement	Aug 31 2012
1c41fff2cf9b	Ludmila Marian/Tibor Simko	bibdocfile: possibility to enforce creation time	Aug 31 2012
0721d2498885	Samuele Kaplun/Tibor Simko	WebSubmit: always kill LibreOffice in unoconv	Aug 30 2012
beec6ee4f01d	Tibor Simko	Merge branch 'maint-1.0'	Aug 30 2012
808cfd7b8b6c	Alexander Wagner/Tibor Simko	I18N: updates to German translation	Aug 30 2012
fd9b9471db66	Ludmila Marian/Tibor Simko	inveniogc: tmp-shared clean-up during GC	Aug 30 2012
671bf0eddfc2	Jerome Caffaro/Tibor Simko	WebAlert: fine-grained record restriction check	Aug 30 2012
0aea5481c2f5	Samuele Carli/Tibor Simko	WebAuthorProfile: JSON fix	Aug 30 2012
38ae1e22655c	Samuele Carli/Tibor Simko	WebAuthorProfile: template fixes	Aug 30 2012
ccf229d2554d	Samuele Carli/Tibor Simko	WebAuthorProfile: cache_not_ready barriers	Aug 30 2012
1fc7d8c62696	Tibor Simko	BibFormat: WAPAFF template fix	Aug 30 2012
a91dbde8aa73	Tibor Simko	WebAuthorProfile: author name link escape fix	Aug 30 2012
a5e6160cf570	Samuele Carli/Tibor Simko	WebAuthorProfile: small fix	Aug 30 2012
3dd4023dfb62	Nikola Yolov/Tibor Simko	WebAuthorProfile: some dirty fixes	Aug 30 2012
9934c2fe53f8	Nikola Yolov/Tibor Simko	WebAuthorProfile: handful of fixes	Aug 30 2012
b95782719602	Jan Aage Lavik/Tibor Simko	WebStyle: WebInterfaceAuthorPages exports removal	Aug 30 2012
ddc01e33fb3a	Samuele Carli/Tibor Simko	WebAuthorProfile: initial release	Aug 30 2012
1656d05b24ea	Tibor Simko	Merge branch 'maint-1.0'	Aug 28 2012
cd16af2bb704	Samuele Kaplun/Tibor Simko	WebSubmit: unoconv calling fix	Aug 28 2012

Changes (60)

		Path
M		.gitignore
M		Makefile.am
M		config/invenio.conf
M		configure.ac
M		modules/Makefile.am
M		modules/bibauthorid/lib/Makefile.am
M		modules/bibauthorid/lib/bibauthorid_dbinterface.py
M		modules/bibauthorid/lib/bibauthorid_personid_maintenance.py
M		modules/bibauthorid/lib/bibauthorid_webapi.py
A		modules/bibauthorid/lib/bibauthorid_webauthorprofileinterface.py
M		modules/bibformat/etc/format_templates/Makefile.am
A		modules/bibformat/etc/format_templates/WebAuthorProfile_affiliations_helper.bft
M		modules/bibformat/etc/output_formats/Makefile.am
A		modules/bibformat/etc/output_formats/WAPAFF.bfo
M		modules/bibformat/lib/bibformat_utils.py
M		modules/bibformat/lib/elements/Makefile.am
A		modules/bibformat/lib/elements/bfe_webauthorpage_affiliations.py
M		modules/bibsched/lib/bibtask_config.py
M		modules/bibupload/doc/admin/bibupload-admin-guide.webdoc
M		modules/bibupload/lib/bibupload.py
M		modules/bibupload/lib/bibupload_regression_tests.py
M		modules/miscutil/lib/dbquery.py
M		modules/miscutil/lib/inveniocfg.py
M		modules/miscutil/lib/urlutils.py
M		modules/miscutil/sql/tabbibclean.sql
M		modules/miscutil/sql/tabcreate.sql
M		modules/miscutil/sql/tabdrop.sql
M		modules/miscutil/sql/tabfill.sql
M		modules/webaccess/lib/webaccess_regression_tests.py
M		modules/webalert/lib/alert_engine.py
A	(dir)	modules/webauthorprofile/
P		modules/webauthorprofile/Makefile.am Copied from modules/bibencode/Makefile.am
A	(dir)	modules/webauthorprofile/bin/
P		modules/webauthorprofile/bin/Makefile.am Copied from modules/bibauthorid/bin/Makefile.am
P		modules/webauthorprofile/bin/webauthorprofile.in Copied from modules/bibauthorid/bin/bibauthorid.in
A	(dir)	modules/webauthorprofile/lib/
P		modules/webauthorprofile/lib/Makefile.am Copied from modules/bibmerge/lib/Makefile.am
P		modules/webauthorprofile/lib/__init__.py Copied from modules/bibauthorid/lib/__init__.py
A		modules/webauthorprofile/lib/webauthorprofile.js
P		modules/webauthorprofile/lib/webauthorprofile_cli.py Copied from modules/bibauthorid/lib/bibauthorid_cli.py
A		modules/webauthorprofile/lib/webauthorprofile_corefunctions.py
A		modules/webauthorprofile/lib/webauthorprofile_daemon.py
A		modules/webauthorprofile/lib/webauthorprofile_dbapi.py
P		modules/webauthorprofile/lib/webauthorprofile_interface.py Copied from modules/bibauthorid/web/Makefile.am
A		modules/webauthorprofile/lib/webauthorprofile_templates.py
A		modules/webauthorprofile/lib/webauthorprofile_webinterface.py
M		modules/websearch/lib/websearch_templates.py
M		modules/websearch/lib/websearch_webinterface.py
M		modules/websession/lib/inveniogc.py
M		modules/websession/lib/websession_webinterface.py
M		modules/websession/lib/webuser.py
M		modules/websession/lib/webuser_config.py
M		modules/webstyle/lib/webinterface_layout.py
M		modules/webstyle/lib/webstyle_templates.py
M		modules/websubmit/bin/inveniounoconv.in
M		modules/websubmit/lib/bibdocfile.py
M		modules/websubmit/lib/bibdocfile_regression_tests.py
M		modules/websubmit/lib/websubmit_file_converter.py
M		modules/websubmit/lib/websubmit_regression_tests.py
M		po/de.po