Doug Bell
|
708b47d73c
|
Merge remote branch 'upstream/WebGUI8' into 8-merge
Conflicts:
docs/gotcha.txt
docs/previousVersion.sql
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
lib/WebGUI/Asset/Wobject/Navigation.pm
lib/WebGUI/AssetLineage.pm
lib/WebGUI/Config.pm
lib/WebGUI/Form/Template.pm
lib/WebGUI/Group.pm
lib/WebGUI/VersionTag.pm
lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
t/AdSpace.t
t/Asset/AssetExportHtml.t
t/Asset/AssetLineage.t
t/Asset/Story.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/InOutBoard.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/Group.t
t/Mail/Send.t
t/Operation/AdSpace.t
t/Session/ErrorHandler.t
t/Session/Scratch.t
t/Session/Url.t
t/Shop/Cart.t
t/Shop/Pay.t
t/Shop/Ship.t
t/Shop/ShipDriver.t
t/Shop/TaxDriver/Generic.t
t/Shop/Vendor.t
t/VersionTag.t
t/lib/WebGUI/Test.pm
|
2010-07-14 18:20:00 -05:00 |
|
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
|
2010-07-09 11:48:30 -05:00 |
|
Colin Kuskie
|
5e502fee53
|
Merge commit '17ce3572bf' into WebGUI8. All tests passing.
|
2010-06-30 18:43:27 -07:00 |
|
Colin Kuskie
|
9678c3d8a7
|
Convert Shop::Pay to use Moose instead of Class::InsideOut. Update tests, and core usages to Moose syntax. Provide a shim so the old, base ->new($session) syntax.
|
2010-06-24 13:31:32 -07:00 |
|
Colin Kuskie
|
b728eabd7b
|
Add cleanup for Shop::Vendors. More end block removal.
|
2010-06-07 18:45:59 -07:00 |
|
Colin Kuskie
|
33d2914c28
|
More test maintenance for Payment drivers.
|
2009-07-23 20:57:51 +00:00 |
|
Colin Kuskie
|
8dcd511a8b
|
Update tests for modified code, and for CSRF checks.
|
2009-07-16 22:35:49 +00:00 |
|
Colin Kuskie
|
9a6a2e4549
|
Update this test to account for the new driver.
|
2009-05-19 22:16:57 +00:00 |
|
Colin Kuskie
|
8d371b320c
|
Update this test for adding a new PayDriver.
|
2009-05-14 03:43:24 +00:00 |
|
Colin Kuskie
|
b877e8fa05
|
Add a basic test for the PayPalStd driver.
|
2009-05-13 23:47:05 +00:00 |
|
Graham Knop
|
24da723629
|
updating copyright year
|
2009-02-20 23:47:30 +00:00 |
|
Colin Kuskie
|
1b6dd7be63
|
Forward port the PayDriver bug fixes from 7.5 branch. Labels are always
taken consistently from the JSON blob, and not a mixture of the two.
|
2009-01-15 00:34:34 +00:00 |
|
Colin Kuskie
|
052d9d67eb
|
Update the test to match the new i18n label.
Remove the trailing period from the ITransact i18n label.
|
2008-07-12 16:28:40 +00:00 |
|
Colin Kuskie
|
e17569c6f7
|
clean up cleaning up and make the getPaymentGateways test more robust
|
2008-06-15 21:56:56 +00:00 |
|
Colin Kuskie
|
70f657d042
|
account for another default paydriver not that itransact has been added
|
2008-05-30 07:14:39 +00:00 |
|
Martin Kamerbeek
|
fb77b80603
|
adding cash paydriver, paydriver management
|
2008-03-24 16:39:42 +00:00 |
|
Colin Kuskie
|
345c54db92
|
Pay.t does not use Test::Exception
|
2008-03-20 17:11:36 +00:00 |
|
Martin Kamerbeek
|
1658f3957d
|
Added WebGUI::TestException and convert Shop/Pay.t to use it.
|
2008-03-11 22:07:21 +00:00 |
|
Martin Kamerbeek
|
b8d9d38da6
|
Require a label to be passed to WebGUI::Shop::Pay->addPaymentGateway
|
2008-03-11 16:54:20 +00:00 |
|
Martin Kamerbeek
|
60362cb747
|
- Added tests for Pay
- Fixed some tests/code for PayDriver
- Added i18n for PayDriver
- Added a really, really bare-bones Cash plugin.
|
2008-03-11 16:33:10 +00:00 |
|