Merge branch 'master' into next
d11e9bb66057
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 18 2013, 14:45.

Description

Merge branch 'master' into next

master: BibSched: motd update check dateutils: strftime improvement WebBasket: Create Basket link in the main display

Conflicts:
THANKS
modules/miscutil/lib/dateutils.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 18 2013, 14:45

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:d11e9bb66057: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 18 2013, 14:45

Commit	Author	Details	Committed
4ebfdf8c8003	Tibor Simko	Merge branch 'maint-1.1'	Mar 18 2013
8f3550e21241	Samuele Kaplun/Tibor Simko	BibSched: motd update check	Mar 18 2013
8a876e573432	Wojciech Ziolek/Tibor Simko	dateutils: strftime improvement	Mar 18 2013
b974452d1f16	Nikolaos Kasioumis/Tibor Simko	WebBasket: Create Basket link in the main display	Mar 18 2013

				Path
	M			THANKS
	M			modules/bibauthorid/lib/bibauthorid_webapi.py
	M			modules/bibcirculation/lib/bibcirculation_daemon.py
	M			modules/bibcirculation/lib/bibcirculation_templates.py
	M			modules/bibsched/lib/bibsched.py
	M			modules/bibsort/lib/bibsort_daemon.py
	M			modules/bibsort/lib/bibsort_engine.py
	M			modules/bibsort/lib/bibsort_washer.py
	M			modules/miscutil/lib/dateutils.py
	M			modules/miscutil/lib/dateutils_unit_tests.py
	M			modules/webbasket/lib/webbasket_templates.py
	M			modules/websearch/lib/websearch_webcoll.py
	M			modules/websearch/lib/websearchadminlib.py
	M			modules/webstyle/css/invenio.css