Merge branch 'maint-1.1'
f00c51ea98e8
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 4 2014, 09:48.

Description

Merge branch 'maint-1.1'

maint-1.1: WebJournal: update demo "Article Header" style WebSubmit: more customizable Link_Records function

Conflicts:
modules/miscutil/sql/tabcreate.sql

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 4 2014, 09:48

Parents

Branches

Unknown

Tags

Unknown

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

	Commit			Author	Details	Committed
	83428ebdcc74			Jerome Caffaro/Tibor Simko	WebJournal: update demo "Article Header" style	Mar 4 2014
	168b99a80375			Jerome Caffaro/Tibor Simko	WebSubmit: more customizable Link_Records function	Mar 4 2014

				Path
	P			modules/miscutil/lib/upgrades/invenio_2013_10_25_new_param_websubmit_function.py Copied from modules/miscutil/lib/upgrades/invenio_2013_02_01_oaiREPOSITORY_last_updated.py
	M			modules/miscutil/sql/tabcreate.sql
	M			modules/webstyle/etc/journal-editor-styles.js
	M			modules/websubmit/lib/functions/Link_Records.py