Merge branch 'master' into next
fec206c0cdfe
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 25 2013, 13:57.

Description

Merge branch 'master' into next

master: WebSearch: fix Search Guide reformatting WebSearch: fix Search Guide mismatch tags WebSearch: Search Guide reformat and pretty-print I18N: updates to Catalan and Spanish translations OAIRepository: forcing clients to re-harvest

Merge note: amended OaiREPOSITORY SQLAlchemy model according to invenio_2013_02_01_oaiREPOSITORY_last_updated.

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 25 2013, 14:11

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:fec206c0cdfe: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 25 2013, 14:11

Commit	Author	Details	Committed
9798a735fd92	Tibor Simko	Merge branch 'maint-1.1'	Feb 25 2013
3c336911e168	Ferran Jorba/Tibor Simko	WebSearch: fix Search Guide reformatting	Feb 25 2013
6c10f6683c11	Ferran Jorba/Tibor Simko	WebSearch: fix Search Guide mismatch tags	Feb 25 2013
d9b1b01d8015	Ferran Jorba/Tibor Simko	WebSearch: Search Guide reformat and pretty-print	Feb 25 2013
578b148dccef	Ferran Jorba/Tibor Simko	I18N: updates to Catalan and Spanish translations	Feb 25 2013
654a5b47ca30	Samuele Kaplun/Tibor Simko	OAIRepository: forcing clients to re-harvest	Feb 22 2013

				Path
	M			config/invenio.conf
	M			modules/miscutil/demo/democfgdata.sql
	P			modules/miscutil/lib/upgrades/invenio_2013_02_01_oaiREPOSITORY_last_updated.py Copied from modules/miscutil/lib/upgrades/invenio_2013_01_08_new_goto_table.py
	M			modules/miscutil/sql/tabcreate.sql
	M			modules/oaiharvest/lib/oai_harvest_model.py
	M			modules/oairepository/doc/admin/oairepository-admin-guide.webdoc
	M			modules/oairepository/lib/oai_repository_admin.py
	M			modules/oairepository/lib/oai_repository_regression_tests.py
	M			modules/oairepository/lib/oai_repository_server.py
	M			modules/oairepository/web/admin/oairepositoryadmin.py
	M			modules/websearch/doc/search-guide.webdoc
	M			po/ca.po
	M			po/es.po