Merge branch 'maint-1.1'
d435254bcebe
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 13 2014, 18:37.

Description

Merge branch 'maint-1.1'

maint-1.1: BibDocFile: convert files and icons asynchronously BibSched: more customizable icon creation tasklet BibSched: icons creation tasklet

Conflicts:
modules/bibdocfile/lib/bibdocfile_managedocfiles.py
modules/bibsched/lib/tasklets/Makefile.am
modules/miscutil/lib/inveniocfg.py

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 13 2014, 18:48

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:d435254bcebe: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 13 2014, 18:48

Commit	Author	Details	Committed
40c208ec8b69	Jerome Caffaro/Tibor Simko	BibDocFile: convert files and icons asynchronously	Mar 13 2014
bdfaee38efd3	Jerome Caffaro/Tibor Simko	BibSched: more customizable icon creation tasklet	Mar 13 2014
0b71fe56a132	Ludmila Marian/Tibor Simko	BibSched: icons creation tasklet	Mar 13 2014

				Path
	M			config/invenio.conf
	M			modules/bibdocfile/lib/bibdocfile_managedocfiles.py
	M			modules/bibsched/lib/tasklets/Makefile.am
	A			modules/bibsched/lib/tasklets/bst_create_icons.py
	A			modules/bibsched/lib/tasklets/bst_create_related_formats.py
	M			modules/miscutil/lib/inveniocfg.py
	P			modules/miscutil/lib/upgrades/invenio_2013_11_12_new_param_websubmit_function.py Copied from modules/miscutil/lib/upgrades/invenio_2013_06_20_new_bibcheck_rules_table.py
	M			modules/miscutil/sql/tabcreate.sql
	M			modules/websubmit/lib/functions/Create_Upload_Files_Interface.py
	M			modules/websubmit/lib/functions/Shared_Functions.py
	M			modules/websubmit/lib/websubmit_file_converter.py