Merge branch 'master' into next
c1520ea8a958
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jul 17 2013, 13:33.

Description

Merge branch 'master' into next

master: WebBasket: 'move item' improvements BibRecord: record_get_field_values with filtering BibRecord: filter field instances

Conflicts:
modules/bibrecord/lib/bibrecord_unit_tests.py

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Jul 17 2013, 13:33

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:c1520ea8a958: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jul 17 2013, 13:33

Commit	Author	Details	Committed
f462cb0a8676	Krzysztof Lis/Tibor Simko	WebBasket: 'move item' improvements	Jul 17 2013
4459a3f7444b	Grzegorz Szpura/Tibor Simko	BibRecord: record_get_field_values with filtering	Jul 12 2013
c8f72cdd0744	Grzegorz Szpura/Tibor Simko	BibRecord: filter field instances	Jul 12 2013

				Path
	M			modules/bibrecord/lib/bibrecord.py
	M			modules/bibrecord/lib/bibrecord_unit_tests.py
	M			modules/webbasket/lib/webbasket.py
	M			modules/webbasket/lib/webbasket_dblayer.py
	M			modules/webbasket/lib/webbasket_templates.py
	M			modules/webbasket/lib/webbasket_webinterface.py