Commit graph

5 commits

Author SHA1 Message Date
Doug Bell
795d88e7e5 Merge commit 'v7.10.17' into 8
Conflicts:
	docs/upgrades/upgrade_7.9.13-7.10.0.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset/Template/TemplateToolkit.pm
	lib/WebGUI/Asset/Wobject/AssetReport.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/Form/Captcha.pm
	lib/WebGUI/Macro/AdminBar.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/PayDriver.pm
	lib/WebGUI/Shop/PayDriver/PayPal/ExpressCheckout.pm
	lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
	lib/WebGUI/Shop/Transaction.pm
	lib/WebGUI/Workflow/Instance.pm
	lib/WebGUI/Workflow/Spectre.pm
	lib/WebGUI/i18n/English/PayDriver.pm
	t/Asset/Asset.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/Wobject/Thingy.t
2011-06-17 20:13:41 -05:00
Doug Bell
c471728ca4 add metadata to assets inside an AssetReport
Thanks to SquOnk for the patch.
2011-05-20 14:25:40 -05:00
Graham Knop
a95ef168cc remove use of FindBin in tests 2010-09-01 14:05:53 -05:00
Colin Kuskie
19199cac9a Fix bugs in AssetReport code, and test. 2010-08-10 20:57:31 -07:00
khenn
22da7c4114 initial release of Asset Report asset allowing reports to be created using asset properties. 2010-08-10 18:53:22 -05:00