Merge branch 'master' into next
3fc4ec5ab561
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jul 3 2013, 09:06.

Description

Merge branch 'master' into next

master: BibFormat: author links for mobile app WebSearch: display number of hits in mobile output BibFormat: initial release of mobile app formats OAIHarvest: fix path for temporary authorlists

Merge note: amended modules/websearch/lib/websearch_fixtures.py with the new formats.

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Jul 3 2013, 09:11

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:3fc4ec5ab561: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jul 3 2013, 09:11

Commit	Author	Details	Committed
c7cd1f184188	Tibor Simko	BibFormat: author links for mobile app	Jul 3 2013
6f0641cbde78	Tibor Simko	WebSearch: display number of hits in mobile output	Jul 3 2013
be86ab82f632	Yannick Tapparel/Tibor Simko	BibFormat: initial release of mobile app formats	Jul 3 2013
fbffced36866	Tibor Simko	Merge branch 'maint-1.1'	Jul 2 2013
260dc6dfb84f	Ludmila Marian/Tibor Simko	OAIHarvest: fix path for temporary authorlists	Jul 2 2013

				Path
	A			modules/bibformat/etc/format_templates/Default_Mobile_brief.bft
	A			modules/bibformat/etc/format_templates/Default_Mobile_detailed.bft
	M			modules/bibformat/etc/format_templates/Makefile.am
	A			modules/bibformat/etc/output_formats/MOBB.bfo
	A			modules/bibformat/etc/output_formats/MOBD.bfo
	M			modules/bibformat/etc/output_formats/Makefile.am
	M			modules/bibformat/lib/elements/bfe_authors.py
	M			modules/miscutil/sql/tabfill.sql
	M			modules/oaiharvest/lib/oai_harvest_daemon.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_fixtures.py