Commit graph

2957 commits

Author SHA1 Message Date
Colin Kuskie
73e53d0ade Fix drag and drop sorting in the Gallery Album edit view in IE7. Requires changes to both the DD JS and the Album edit template. Fixes bug #11796. 2010-08-25 11:44:01 -07:00
Colin Kuskie
0df5431ee3 Add missing gallery images for navigation back to sites. Fixes bug #11798 2010-08-25 11:44:01 -07:00
Colin Kuskie
7b218942b3 Merge commit '63865eb39f' into WebGUI8. up to 7.9.11 2010-08-13 11:52:08 -07:00
Colin Kuskie
26f34a3df8 Updated merged WebGUI package. 2010-08-10 21:30:14 -07:00
khenn
adf3fe68b0 Merge branch 'master' of git@github.com:plainblack/webgui 2010-08-10 20:15:08 -05:00
khenn
91d4aa3059 Fixed i18n inside templates. Fixed URL of folder to match asset 2010-08-10 20:14:27 -05:00
Colin Kuskie
c51b2562a4 Merge AssetReport into the shunt upgrade. 2010-08-10 17:12:59 -07:00
khenn
22da7c4114 initial release of Asset Report asset allowing reports to be created using asset properties. 2010-08-10 18:53:22 -05:00
Colin Kuskie
b45c693802 Remove unused storage locations. 2010-08-10 16:00:57 -07:00
Colin Kuskie
e10f2c76d0 Add more missing module lines. 2010-08-10 15:25:04 -07:00
Colin Kuskie
2003f0543b Add missing module use line for WikiPage. 2010-08-10 15:19:57 -07:00
Colin Kuskie
07b4258cb9 Shunt upgrade code from 7.8.24 to 7.9.11 2010-08-10 15:16:48 -07:00
Colin Kuskie
6130165282 Move StoryTopic upgrade sub for storySortOrder into the present release, instead of the previous one. 2010-08-10 10:32:47 -07:00
Doug Bell
89c1afd10e fix 11758: formatting on account stuff is wrong 2010-08-10 11:51:55 -05:00
Colin Kuskie
a1b1eaff3c Add the default email subscription template again, since it seems to be missing from the 7.8 sites that got upgraded. 2010-08-09 10:19:35 -07:00
Colin Kuskie
6a9b6642d2 Fix bad escaping of dashes for element Ids in the Matrix. Fixes bug #11588. 2010-08-03 11:03:15 -07:00
Scott Walters
e033192328 StoryTopic 'Alphabetically' sort order 2010-07-28 08:33:52 -04:00
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
Colin Kuskie
8504f65bf0 Ready for 7.9.11 development. This will be the freeze version for 7.9. 2010-07-27 20:34:06 -07:00
Colin Kuskie
c92d18259c Move upgrade package to correct location 2010-07-27 12:06:51 -07:00
Colin Kuskie
a5fab797e6 Add pagination control to the default DataForm list template. Fixes bug #11744. 2010-07-27 12:06:02 -07: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
Colin Kuskie
2e4656931e move upgrade sub to correct version. 2010-07-20 10:46:07 -07:00
Colin Kuskie
0cfa3f9edf Add spamStopWords to default WebGUI config file, and add upgrade snippet. Fixes bug #11721. 2010-07-20 10:44:54 -07:00
Scott Walters
c95ef7a656 Remove duplicates before adding a primary key to groupGroupings.
Fixes #11723.
2010-07-15 17:48:00 -04:00
Colin Kuskie
607218880e Remove upgrade files in wrong location. Update upgrade directory to 8. 2010-07-15 14:34:46 -07: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
Colin Kuskie
18da6a8be7 Ready for 7.9.10 development cycle. 2010-07-13 20:00:09 -07:00
Colin Kuskie
987ee3e1fe When processing templates during an upgrade, it has to be done after importing packages. 2010-07-13 19:08:27 -07:00
Colin Kuskie
bcecfec0e9 Move upgrade package to the right location. 2010-07-13 15:09:31 -07:00
Colin Kuskie
fd394dbb06 Manually constructed URL's have to manually URI encode parameters. Fixes bug #11718. 2010-07-13 15:09:06 -07:00
Doug Bell
f78386da15 fix merge 2010-07-13 13:17:40 -05:00
Doug Bell
65e9902001 migrate to JsonTable to edit template attachments 2010-07-13 13:12:46 -05:00
Colin Kuskie
fd834a5384 Handle the case of an empty field name when adding user profile fields. Fixes bug #11715. 2010-07-13 09:48:09 -07:00
Colin Kuskie
fd153b80e9 Always use good macro form when using the Extras macro. Fixes bug #11455. 2010-07-12 17:13:38 -07: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
Colin Kuskie
0e9194114f Add index to userLoginLog so that DeleteExpiredSessions can scale. Fixes bug #11708 2010-07-12 10:08:22 -07: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
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
Doug Bell
6cf68e59a2 migrate to JsonTable to edit template attachments 2010-06-30 17:03:50 -05:00
Colin Kuskie
c5257dca0e Ready for 7.9.9 development. 2010-06-29 22:08:11 -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
5b5c100bfa Remove 7.8 packages from HEAD. 2010-06-29 13:15:27 -07:00
Colin Kuskie
46b4f08de7 Refactor gallery CSS. Use spans instead of inline divs for rows. Add overflow settings for picture details. Fixes bug #11663. 2010-06-29 12:13:27 -07:00
Colin Kuskie
385931aaab Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing. 2010-06-27 22:32:31 -07:00
Doug Bell
7af21286c2 add template package 2010-06-27 22:09:06 -05:00
Doug Bell
3abea67b66 add template for choose username 2010-06-27 22:09:05 -05:00
Doug Bell
8d95864a7c move upgrade to correct script 2010-06-27 22:09:05 -05:00