Doug Bell 0c5acb697b Merge commit 'v7.10.18' into 8 ... Conflicts: docs/gotcha.txt docs/previousVersion.sql docs/templates.txt lib/WebGUI.pm lib/WebGUI/Asset/File.pm lib/WebGUI/Asset/Story.pm lib/WebGUI/Asset/Wobject/Calendar.pm lib/WebGUI/Asset/Wobject/Thingy.pm lib/WebGUI/AssetExportHtml.pm lib/WebGUI/Content/AssetManager.pm lib/WebGUI/Group.pm lib/WebGUI/Macro/AssetProxy.pm lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm lib/WebGUI/Storage.pm t/Asset/AssetExportHtml.t t/Asset/Story.t t/Shop/TaxDriver/Generic.t t/Storage.t		2011-06-21 16:03:49 -05:00
..
PayDriver	getEditForm returns FormBuilder and csrfToken should be added by www_edit	2011-05-05 19:43:32 -05:00
ShipDriver	Merge commit 'v7.10.15' into 8	2011-05-13 18:15:11 -05:00
TaxDriver	Merge commit 'v7.10.18' into 8	2011-06-21 16:03:49 -05:00
Address.t	remove use of FindBin in tests	2010-09-01 14:05:53 -05:00
AddressBook.t	remove use of FindBin in tests	2010-09-01 14:05:53 -05:00
Cart.t	Merge commit 'v7.10.15' into 8	2011-05-13 18:15:11 -05:00
Credit.t	Test cleanup after merge to 7.10.2	2010-10-27 18:42:43 -07:00
loadProductAssets.pl
loadProducts.pl
loadTaxes.pl
Pay.t	remove use of FindBin in tests	2010-09-01 14:05:53 -05:00
PayDriver.t	remove diags from test	2011-02-25 15:45:40 -06:00
Ship.t	Update Ship master class for new ShipDriver requirements.	2010-10-14 19:34:25 -07:00
ShipDriver.t	migrate ship getEditForm to FormBuilder	2011-02-25 15:45:40 -06:00
Tax.t	remove use of FindBin in tests	2010-09-01 14:05:53 -05:00
Transaction.t	Merge commit 'v7.10.15' into 8	2011-05-13 18:15:11 -05:00
TransactionItem.t	Merge commit 'v7.10.15' into 8	2011-05-13 18:15:11 -05:00
Vendor.t	remove use of FindBin in tests	2010-09-01 14:05:53 -05:00