Commit graph

12 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
ed04b99872 remove WebGUI::Utility 2010-09-07 13:18:49 -05:00
Doug Bell
c9f37ae53d i18n doesn't need .pm at the end of it 2010-08-25 12:34:39 -05:00
Colin Kuskie
11ac13c349 Prune out a method call from db->dbh->quote_identifier. 2010-08-14 17:51:25 -07:00
Colin Kuskie
7b218942b3 Merge commit '63865eb39f' into WebGUI8. up to 7.9.11 2010-08-13 11:52:08 -07:00
Colin Kuskie
19199cac9a Fix bugs in AssetReport code, and test. 2010-08-10 20:57:31 -07:00
Doug Bell
1a22d13aa1 document why we only allow admins to add 2010-08-10 22:22:09 -05:00
khenn
6e9a15cd50 Fixed issues with sort order 2010-08-10 22:14:26 -05:00
khenn
3141a6ed5e Fixed injection issues with SQL. Fixed a JS issue introduced in previous bug fix. 2010-08-10 21:35:07 -05:00
khenn
1ef6f197e7 Removed inheritance of Installable Aspect which was there for testing purposes only 2010-08-10 18:58:27 -05: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