Merge branch 'maint-1.0' into maint-1.1
9130b1ab2a97
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Dec 5 2013, 18:50.

Description

Merge branch 'maint-1.0' into maint-1.1

maint-1.0: installation: empty Travis configuration WebSubmit: fix for typo in Shared_Functions WebSearch: correct record sums from hosted colls global: language value always in link URLs WebSearch: space between records in MARC HTML

Conflicts:
modules/websearch/lib/websearch_webcoll.py

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Dec 5 2013, 18:50

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:9130b1ab2a97: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Dec 5 2013, 18:50

Commit	Author	Details	Committed
3dcd0617cefe	Tibor Simko	Merge branch 'maint-0.99' into maint-1.0	Dec 5 2013
0ce57ace5dbc	Tibor Simko	installation: empty Travis configuration	Dec 5 2013
a9786aa28381	Jerome Caffaro/Tibor Simko	WebSubmit: fix for typo in Shared_Functions	Dec 2 2013
6be1b3d522ae	Nikolaos Kasioumis/Tibor Simko	WebSearch: correct record sums from hosted colls	Dec 2 2013
c91cf86e5caa	Nikolaos Kasioumis/Tibor Simko	global: language value always in link URLs	Dec 2 2013
c3f686ed8c41	Nikolaos Kasioumis/Tibor Simko	WebSearch: space between records in MARC HTML	Dec 2 2013

				Path
	P			.travis.yml Copied from modules/webauthorprofile/Makefile.am
	M			modules/bibupload/lib/bibupload_regression_tests.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_templates.py
	M			modules/websearch/lib/websearch_webcoll.py
	M			modules/webstyle/lib/webdoc.py
	M			modules/webstyle/lib/webdoc_unit_tests.py
	M			modules/websubmit/lib/functions/Shared_Functions.py