Doug Bell
babfa74209
Merge branch 'master' into 8-merge
Conflicts:
docs/gotcha.txt
lib/WebGUI.pm
lib/WebGUI/Asset.pm
lib/WebGUI/Asset/File/GalleryFile/Photo.pm
lib/WebGUI/Asset/Post.pm
lib/WebGUI/Asset/Story.pm
lib/WebGUI/Asset/Template.pm
lib/WebGUI/Asset/Wobject/Calendar.pm
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
lib/WebGUI/Asset/Wobject/Navigation.pm
lib/WebGUI/AssetLineage.pm
lib/WebGUI/AssetTrash.pm
lib/WebGUI/Config.pm
lib/WebGUI/Form/Template.pm
lib/WebGUI/Group.pm
lib/WebGUI/Inbox.pm
lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
sbin/testEnvironment.pl
t/AdSpace.t
t/AdSpace/Ad.t
t/Asset/Asset.t
t/Asset/AssetExportHtml.t
t/Asset/AssetLineage.t
t/Asset/EMSSubmissionForm.t
t/Asset/Event.t
t/Asset/File/GalleryFile/Photo/00base.t
t/Asset/File/GalleryFile/Photo/comment.t
t/Asset/File/GalleryFile/Photo/download.t
t/Asset/File/GalleryFile/Photo/edit.t
t/Asset/File/GalleryFile/Photo/exif.t
t/Asset/File/GalleryFile/Photo/makeResolutions.t
t/Asset/File/GalleryFile/Photo/makeShortcut.t
t/Asset/File/Image/setfile.t
t/Asset/File/setfile.t
t/Asset/Post.t
t/Asset/Post/Thread/getAdjacentThread.t
t/Asset/Sku.t
t/Asset/Sku/ProductCollateral.t
t/Asset/Story.t
t/Asset/Template.t
t/Asset/Template/HTMLTemplateExpr.t
t/Asset/Wobject/Gallery/00base.t
t/Asset/Wobject/GalleryAlbum/00base.t
t/Asset/Wobject/GalleryAlbum/ajax.t
t/Asset/Wobject/GalleryAlbum/delete.t
t/Asset/Wobject/Matrix.t
t/Asset/Wobject/StoryArchive.t
t/Asset/Wobject/Survey/ExpressionEngine.t
t/Asset/Wobject/Survey/Reports.t
t/AssetAspect/RssFeed.t
t/Auth/mech.t
t/Config.t
t/Group.t
t/Help/isa.t
t/International.t
t/Mail/Send.t
t/Operation/AdSpace.t
t/Operation/Auth.t
t/Pluggable.t
t/Session.t
t/Session/DateTime.t
t/Session/ErrorHandler.t
t/Session/Scratch.t
t/Session/Stow.t
t/Shop/Cart.t
t/Shop/Pay.t
t/Shop/PayDriver/ITransact.t
t/Shop/PayDriver/PayPalStd.t
t/Shop/Ship.t
t/Shop/ShipDriver.t
t/Shop/TaxDriver/EU.t
t/Shop/TaxDriver/Generic.t
t/Shop/Transaction.t
t/Shop/Vendor.t
t/VersionTag.t
t/Workflow/Activity/ArchiveOldStories.t
t/Workflow/Activity/ExpireIncompleteSurveyResponses.t
t/lib/WebGUI/Test.pm