Commit graph

2610 commits

Author SHA1 Message Date
Colin Kuskie
ca9a3bd6c7 Merge branch 'master' into WebGUI8, up to 7.9.10. Some tests failing due to changes in default content. 2010-07-27 22:55:57 -07:00
khenn
078bc0e162 fixed #11745: Pagination doesn't work in DataForm list mode 2010-07-27 11:20:30 -05:00
Scott Walters
d17d096380 StoryArchive optional sorting by title.
Fwiw, this code was written a while ago but seems to have gotten
misplaced.
2010-07-23 09:13:55 -04:00
Doug Bell
2471517fa7 remove getAdminConsole from Survey 2010-07-15 12:54:31 -05:00
Doug Bell
e56c665057 fix layout options subs 2010-07-15 11:55:25 -05:00
Doug Bell
3934a6704c fix getEditForm 2010-07-15 11:55:25 -05:00
Doug Bell
1caef590cc fix navigation edit form 2010-07-15 11:55:25 -05:00
Doug Bell
3c17dafeb4 processPropertiesFromFormPost to processEditForm 2010-07-15 11:52:04 -05:00
Doug Bell
ad96c88a36 initial edit page work 2010-07-15 11:49:54 -05:00
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
cd1e450c32 Merge branch 'master' into 8-merge
Conflicts:
	docs/gotcha.txt
	docs/upgrades/upgrade_7.9.8-7.9.9.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	t/Asset/Asset.t
	t/Mail/Send.t
	t/Session/Url.t
	t/lib/WebGUI/Test.pm
2010-07-14 17:06:19 -05:00
Doug Bell
69b7fe0465 fix jsontable and use it for Calendar feeds 2010-07-13 13:12:47 -05:00
Colin Kuskie
e66be2a5b3 Add a minimum height to the Carousel due to further rendering problems. Fixes bug #11457. 2010-07-12 14:49:53 -07:00
Doug Bell
29b1f794cd fix merge problems 2010-07-12 15:52:38 -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
90f0a9b006 Fix date field type detection during import. Fixes bug #11692. 2010-07-05 09:02:48 -07:00
Colin Kuskie
e0177dc666 Remove Session::Env, migrate code to Plack::Request object in Session, and WebGUI::Session::Request 2010-07-01 17:40:12 -07:00
Colin Kuskie
005b9da1ac Move session->env->getIp into session->request->address 2010-07-01 13:11:01 -07:00
Doug Bell
bbc756c852 fix jsontable and use it for Calendar feeds 2010-07-01 13:11:37 -05:00
Colin Kuskie
565cf955d7 Merge commit '469c2b72b4' into WebGUI8. All tests passing. 2010-07-01 10:13:22 -07:00
Colin Kuskie
5e502fee53 Merge commit '17ce3572bf' into WebGUI8. All tests passing. 2010-06-30 18:43:27 -07:00
Colin Kuskie
bb2587b1ea Add a new template variable to the Thingy search screen, so that List type form fields can display a better form for searching. Fixes bug #11612. 2010-06-29 15:14:12 -07:00
Colin Kuskie
0efc6514e3 Don't call asset methods on undef in the GalleryAlbum. Fixes bug #11681. 2010-06-29 13:50:36 -07:00
Colin Kuskie
385931aaab Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing. 2010-06-27 22:32:31 -07:00
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
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
b7ba9f2118 Fix problems with the Story Archive leaking version tags when it is not committed. Fixes bug #11678 2010-06-23 14:12:42 -07:00
Colin Kuskie
321f165147 Prevent type-casting warning when a Product has no price. 2010-06-23 08:46:09 -07:00
Colin Kuskie
eed390e96b Prevent type-casting warning when a Product has no price. 2010-06-23 08:45:33 -07:00
khenn
ef31678b7f Fixed #11656: Thingy: Select list fields are not sorted properly 2010-06-17 12:30:22 -05:00
Colin Kuskie
19c2c5fa1c Remove status description from Session/Http, and update all users of setStatus. 2010-06-17 08:18:24 -07:00
Colin Kuskie
dc62dedf76 Remove bad POD from the Gallery. 2010-06-14 11:30:36 -07:00
Graham Knop
89d4f46a18 Merge branch 'psgi' into WebGUI8 2010-06-11 23:05:06 -05: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
kimd
cb82394575 Added search by location to the Gallery (RFE 11504) 2010-06-09 15:28:42 -05:00
Graham Knop
02af1c68f9 Merge branch 'WebGUI8' into psgi 2010-06-08 17:59:17 -05:00
Colin Kuskie
c4e85d8b44 Restore the other fields that a CS can be sorted on, from the thread table. Fixes bug #11614. 2010-06-07 15:03:03 -07:00
Colin Kuskie
28eabdd997 Remove some dead code from the UserList wobject. Fixes bug #11605 2010-06-07 08:25:14 -07: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
khenn
e74753c082 Not enough arguments to searchOther 2010-06-04 17:28:36 -05:00
khenn
d082e4eee3 Fixed #11613 - After successful save of a Thing, the form is cleared for the next thing to be entered 2010-06-04 17:00:24 -05:00
Colin Kuskie
951864f6d3 Add more tests for Calendar edge cases, and remove 1 day from the all day event window in getEventsIn. Fixes bug #11596. 2010-06-02 14:53:38 -07:00
Doug Bell
1f492b5fd6 fix navigation problem 2010-06-01 20:17:24 -05:00
Doug Bell
247c607393 fixes for weaken and iterator 2010-06-01 19:37:53 -05:00
Doug Bell
2c75ab27e6 migrate to getLineageIterator to save memory 2010-06-01 16:23:49 -05:00