Commit graph

3583 commits

Author SHA1 Message Date
Colin Kuskie
e5b82bc861 Merge commit '4969f31e1f' into WebGUI8 2010-06-26 14:37:31 -07:00
Colin Kuskie
5febc0ebbc Merge commit '41575d24bb' into webgui8. Some tests still failing.
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/Template.pm
	lib/WebGUI/Asset/WikiPage.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/Cache.pm
	lib/WebGUI/Content/Setup.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Pay.pm
	lib/WebGUI/Shop/PayDriver/ITransact.pm
	sbin/testEnvironment.pl
	t/Asset/WikiPage.t
	t/Shop/PayDriver.t
	t/Shop/PayDriver/ITransact.t
	t/Shop/PayDriver/Ogone.t
	t/Shop/TaxDriver/EU.t
	t/Shop/TaxDriver/Generic.t
	t/Workflow/Activity/RemoveOldCarts.t
	t/lib/WebGUI/Test.pm
2010-06-25 23:25:26 -07:00
Colin Kuskie
b30491f3a6 Merge commit '808a866c8b' into webgui8. 7.9.4 release point
Conflicts:
	docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg
	docs/upgrades/upgrade_7.9.2-7.9.3.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset/MapPoint.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Gallery.pm
	lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/AssetClipboard.pm
	lib/WebGUI/AssetVersioning.pm
	lib/WebGUI/Auth.pm
	t/Asset/Asset.t
2010-06-25 20:08:11 -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
3fbc109429 Update Session->Style setScript to default to text/javascript. Update the entire codebase to take advantage of it. 2010-06-24 13:07:03 -07:00
Colin Kuskie
eed390e96b Prevent type-casting warning when a Product has no price. 2010-06-23 08:45:33 -07:00
Colin Kuskie
19c2c5fa1c Remove status description from Session/Http, and update all users of setStatus. 2010-06-17 08:18:24 -07:00
Graham Knop
89d4f46a18 Merge branch 'psgi' into WebGUI8 2010-06-11 23:05:06 -05:00
Colin Kuskie
dcdd671b2c Fix the pending flag, get a fresh copy of the photo asset under test. 2010-06-11 20:18:48 -07:00
Colin Kuskie
7df0cc51ed Always get a fresh copy of the survey after doing revision control. 2010-06-11 19:11:12 -07:00
Colin Kuskie
b8fc033bd7 Update the icalFeeds field to use JSON fields correctly. 2010-06-11 11:50:32 -07:00
Graham Knop
b1b1a3cc62 force scalar context in some needed places 2010-06-10 23:52:10 -05:00
Graham Knop
02af1c68f9 Merge branch 'WebGUI8' into psgi 2010-06-08 17:59:17 -05:00
Graham Knop
1e2b6fd0c2 allow undefined template or snippet text 2010-06-07 18:09:18 -05:00
Colin Kuskie
be259d803c Fix problems with assetExportHtml. The method needs to be rethought, and make check that one exists before calling it via can/DOES. Fix a problem with duplicating the session, since duplicate is not a class method. 2010-06-05 22:25:18 -07:00
Patrick Donelan
f16ba76b86 Merge branch 'WebGUI8' into psgi
Conflicts:
	sbin/testEnvironment.pl
2010-06-04 21:01:03 -04:00
Colin Kuskie
95b6b66d69 fix a problem with the generated HTML id. 2010-06-03 16:56:19 -07:00
Colin Kuskie
89302e9875 Fix taxConfiguration property for the Sku asset. 2010-05-23 16:33:30 -07:00
Colin Kuskie
0fac75759e Actually build an array of items in getRssFeedItems. Fix several method modifiers. 2010-05-21 19:26:55 -07:00
Colin Kuskie
3870aea526 Remove deprecated methods in SyndicatedContent. 2010-05-21 19:15:22 -07:00
Colin Kuskie
bf268bc66b Fix the canEdit method in the Matrix. 2010-05-21 15:05:00 -07:00
Colin Kuskie
dab177324d Change from encode/decode to to/from in JSON, and call them explicitly. Exception handling for AJAX methods in the GalleryAlbum. 2010-05-21 13:37:06 -07:00
Colin Kuskie
9e50f5e8c2 Exception and class handling for getLastPost in the Thread. Update a test accordingly. 2010-05-20 15:45:28 -07:00
Colin Kuskie
f1ea8105d4 Allow users to unsubscribe via email address, without logging in. Fixes bug #11559. 2010-05-18 15:58:24 -07:00
Doug Bell
96a52c5748 Merge remote branch 'spunky/rfe11517' 2010-05-18 11:24:23 -05:00
Colin Kuskie
9cf2a308c5 Make the shortcut obey the modified permissions of its originating Asset. Fixes bug #11549. 2010-05-18 08:46:13 -07:00
Colin Kuskie
3ae3684aea Better handling for paragraphs in the SC. This code needs to be refactored out and generalized into a method that anything can use. Fixes bug #11563. 2010-05-17 13:15:32 -07:00
kimd
8030bed30b Gallery: Sorting of files uploaded in zip archives (RFE 11517) 2010-05-17 22:03:38 +02:00
Colin Kuskie
427fd5e53a Removing more dead code. There is no maxImageSize property. 2010-05-13 19:46:47 -07:00
Colin Kuskie
252138777c Fix a bad sort. Clarify some POD in the Photo. 2010-05-13 15:50:46 -07:00
Colin Kuskie
4fef8cb486 Fix a bad sort. Clarify some POD in the Photo. 2010-05-13 15:41:51 -07:00
Colin Kuskie
7258e11e7e Move Shortcut definition methods to Moose methods. 2010-05-13 15:28:45 -07:00
Colin Kuskie
8a9e4c73c1 Remove dead code in the Photo asset. 2010-05-13 14:06:13 -07:00
Colin Kuskie
6dbd389c86 Remove dead code in the Photo asset. 2010-05-13 14:05:10 -07:00
Colin Kuskie
7f23c286da Change newByDynamicClass to newById. 2010-05-13 13:50:04 -07:00
Colin Kuskie
b1221a8442 DataTable pagination is not by page, but by result number. Fixes bug #11567. 2010-05-12 13:48:09 -07:00
Colin Kuskie
2a6e50b478 Make this code readable. 2010-05-11 22:13:25 -07:00
Graham Knop
65dfb6e683 Merge branch 'WebGUI8' into psgi 2010-05-10 17:03:17 -05:00
Graham Knop
8597bdbb0f allow undefined template or snippet text 2010-05-10 17:02:29 -05:00
Colin Kuskie
f3d95f99b4 Change how the query is persisted in Wiki search results. Fixes bug #11558. 2010-05-10 13:23:32 -07:00
Graham Knop
c11d195b21 forgot to pass param 2010-05-10 13:13:26 -05:00
Graham Knop
06d61ec19d fixed: UserList asset has SQL injection bug 2010-05-10 13:07:02 -05:00
Colin Kuskie
7ba305109a Set a trigger for the snippet. Update tests for snippet packing. 2010-05-09 21:44:18 -07:00
Colin Kuskie
50b2b116eb Updated to Moose, and test updates. 2010-05-09 21:04:12 -07:00
Colin Kuskie
ecf1c521f3 Updates for Moose. 2010-05-09 21:03:59 -07:00
Colin Kuskie
95fe1e6d52 Module use, and cache updates. 2010-05-09 18:14:27 -07:00
Colin Kuskie
057260f131 fix a ->get conversion typo. 2010-05-09 18:04:19 -07:00
Colin Kuskie
1450d1361d Fix POD problems 2010-05-07 18:27:39 -07:00
Colin Kuskie
d0b17aced8 Update EMSSubmission to Moose. 2010-05-07 13:43:04 -07:00
Paul Driver
40d11e8693 more sorting options for SyndicatedContent 2010-05-06 15:03:01 -07:00