Diffusion invenio-infoscience 0720dd99d9ba

Merge branch 'master' into next
0720dd99d9ba
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 12 2012, 05:12.

Description

Merge branch 'master' into next

master-old: WebSubmit: bibdocfile-related build fix WebSession: useful guest sessions WebAccess: external person id for INSPIRE WebJournal: regression test case fix BibDocFile: split from WebSubmit BibUpload: regression test case fix BibConvert: fix for static files in admin guide

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Sep 12 2012, 05:12

Parents

R3600:928826fed558: WebSubmit: bibdocfile-related build fix
R3600:826cb552c2a0: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:0720dd99d9ba: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 12 2012, 05:12

Merged Changes

Commit	Author	Details	Committed
928826fed558	Tibor Simko	WebSubmit: bibdocfile-related build fix	Sep 11 2012
d7d5ee9b0b50	Samuele Kaplun/Tibor Simko	WebSession: useful guest sessions	Sep 11 2012
d7c6757d8418	Samuele Kaplun/Tibor Simko	WebAccess: external person id for INSPIRE	Sep 11 2012
c4cdd390ec37	Samuele Kaplun/Tibor Simko	WebJournal: regression test case fix	Sep 11 2012
d3f2739b63a2	Samuele Kaplun/Tibor Simko	BibDocFile: split from WebSubmit	Sep 11 2012
7cdfaafd5b8b	Samuele Kaplun/Tibor Simko	BibUpload: regression test case fix	Sep 11 2012
a65fe787a12f	Tibor Simko	Merge branch 'maint-1.0'	Sep 11 2012
bbd3a8ee40b2	Tibor Simko	BibConvert: fix for static files in admin guide	Sep 11 2012

Changes (75)

		Path
M		.gitignore
M		Makefile.am
M		config/invenio-autotools.conf.in
M		config/invenio.conf
M		configure.ac
M		modules/Makefile.am
P		modules/bibconvert/doc/admin/Makefile.am Copied to modules/bibdocfile/lib/Makefile.am
M		modules/bibconvert/doc/admin/bibconvert-admin-guide.webdoc
M		modules/bibconvert/lib/bibconvert_regression_tests.py
A	(dir)	modules/bibdocfile/
P		modules/bibdocfile/Makefile.am Copied from modules/websubmit/bin/Makefile.am
A	(dir)	modules/bibdocfile/bin/
P		modules/bibdocfile/bin/Makefile.am Copied from modules/websubmit/bin/Makefile.am
P		modules/bibdocfile/bin/bibdocfile Copied from modules/websubmit/bin/bibdocfile.in
V		modules/{bibdocfile ← websubmit}/bin/bibdocfile.in
A	(dir)	modules/bibdocfile/doc/
P		modules/bibdocfile/doc/Makefile.am Copied from modules/websubmit/bin/Makefile.am
A	(dir)	modules/bibdocfile/doc/hacking/
P		modules/bibdocfile/doc/hacking/Makefile.am Copied from modules/websubmit/bin/Makefile.am
V		modules/{bibdocfile ← websubmit}/doc/hacking/bibdocfile-api.webdoc
P		modules/bibdocfile/doc/hacking/bibdocfile-internals.webdoc Copied from modules/websubmit/doc/hacking/websubmit-internals.webdoc
A	(dir)	modules/bibdocfile/lib/
P		modules/bibdocfile/lib/Makefile.am Copied from modules/bibconvert/doc/admin/Makefile.am
V		modules/{bibdocfile ← websubmit}/lib/bibdocfile.py
A		modules/bibdocfile/lib/bibdocfile_config.py
V		modules/{bibdocfile/lib/bibdocfile_managedocfiles.py ← websubmit/lib/websubmit_managedocfiles.py}
V		modules/{bibdocfile ← websubmit}/lib/bibdocfile_regression_tests.py
A		modules/bibdocfile/lib/bibdocfile_templates.py
A		modules/bibdocfile/lib/bibdocfile_webinterface.py
V		modules/{bibdocfile ← websubmit}/lib/bibdocfilecli.py
V		modules/{bibdocfile ← websubmit}/lib/file.py
V		modules/{bibdocfile ← websubmit}/lib/fulltext_files_migration_kit.py
V		modules/{bibdocfile ← websubmit}/lib/icon_migration_kit.py
M		modules/bibedit/lib/bibedit_engine.py
M		modules/bibformat/lib/elements/bfe_edit_files.py
M		modules/bibformat/lib/elements/bfe_fulltext.py
M		modules/bibupload/lib/bibupload.py
M		modules/bibupload/lib/bibupload_regression_tests.py
M		modules/miscutil/lib/inveniocfg.py
M		modules/miscutil/sql/tabfill.sql
M		modules/webaccess/lib/access_control_config.py
M		modules/webhelp/web/hacking/hacking.webdoc
M		modules/webjournal/lib/webjournal_regression_tests.py
M		modules/websearch/lib/search_engine.py
M		modules/websearch/lib/websearch_webinterface.py
M		modules/websession/lib/session.py
M		modules/websession/lib/websession_templates.py
M		modules/webstyle/lib/webinterface_layout.py
P		modules/websubmit/bin/Makefile.am Copied to multiple locations: modules/bibdocfile/Makefile.am modules/bibdocfile/bin/Makefile.am modules/bibdocfile/doc/Makefile.am modules/bibdocfile/doc/hacking/Makefile.am
P		modules/websubmit/bin/bibdocfile.in Deleted after being copied to multiple locations: modules/bibdocfile/bin/bibdocfile modules/bibdocfile/bin/bibdocfile.in
M		modules/websubmit/doc/hacking/Makefile.am
V		modules/{websubmit → bibdocfile}/doc/hacking/bibdocfile-api.webdoc
P		modules/websubmit/doc/hacking/websubmit-internals.webdoc Copied to modules/bibdocfile/doc/hacking/bibdocfile-internals.webdoc
M		modules/websubmit/lib/Makefile.am
V		modules/{websubmit → bibdocfile}/lib/bibdocfile.py
V		modules/{websubmit → bibdocfile}/lib/bibdocfile_regression_tests.py
V		modules/{websubmit → bibdocfile}/lib/bibdocfilecli.py
V		modules/{websubmit → bibdocfile}/lib/file.py
V		modules/{websubmit → bibdocfile}/lib/fulltext_files_migration_kit.py
M		modules/websubmit/lib/functions/Create_Upload_Files_Interface.py
M		modules/websubmit/lib/functions/Generate_Group_File.py
M		modules/websubmit/lib/functions/Move_Files_to_Storage.py
M		modules/websubmit/lib/functions/Move_Photos_to_Storage.py
M		modules/websubmit/lib/functions/Move_Revised_Files_to_Storage.py
M		modules/websubmit/lib/functions/Move_Uploaded_Files_to_Storage.py
M		modules/websubmit/lib/functions/Stamp_Replace_Single_File_Approval.py
V		modules/{websubmit → bibdocfile}/lib/icon_migration_kit.py
M		modules/websubmit/lib/websubmit_config.py
M		modules/websubmit/lib/websubmit_engine.py
M		modules/websubmit/lib/websubmit_file_converter.py
V		modules/{websubmit/lib/websubmit_managedocfiles.py → bibdocfile/lib/bibdocfile_managedocfiles.py}
M		modules/websubmit/lib/websubmit_regression_tests.py
M		modules/websubmit/lib/websubmit_templates.py
M		modules/websubmit/lib/websubmit_web_tests.py
M		modules/websubmit/lib/websubmit_webinterface.py