Commit graph

2928 commits

Author SHA1 Message Date
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
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
Doug Bell
a2e246705f allow twitter enable/disable from settings 2010-06-27 22:09:05 -05:00
Doug Bell
f522d9e69d upgrade adds twitter auth 2010-06-27 22:09:05 -05: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
da320a0313 Add a template variable to hide the subscribe form when editing a Post when the user is subscribed to the parent CS. Updated all PostForm templates to use this new variable. Fixes bug #11626. 2010-06-22 08:06:25 -07:00
Colin Kuskie
54c56019d1 Update lastPost information in the Thread and CS when a Post is archived. Made a separate method so it can be used by other actions, and in the upgrade script. Fixes bug #11628. 2010-06-21 14:38:46 -07:00
Colin Kuskie
cca5daed60 Fix the dataDefault for firstDayOfWeek. Fixes bug #11651 2010-06-16 11:02:01 -07:00
Colin Kuskie
9bc7208c48 Ready for 7.9.8 development 2010-06-15 16:00:49 -07:00
Graham Knop
650918ed3f remove left over upgrades 2010-06-11 23:39:05 -05:00
kimd
fa04d01518 o Allow return from photo edit view to gallery edit view (RFE 11571)
o Reject form submissions without image selected for upload in edit view of Photo asset
2010-06-09 15:28:42 -05:00
Colin Kuskie
30e869b66d Better cleanup of Inbox messages. Encapsulate all SQL in Inbox/Message. Fix workflow. Upgrade script to cleanup state table. Fixes bug #11595. 2010-06-07 10:44:12 -07:00
Colin Kuskie
5a904a85db Do not delete cron tasks with errors, just notify spectre of the problem. Fixes bug #11604. 2010-06-03 10:56:03 -07:00
Doug Bell
dcf8b747b1 preparing for 7.9.7 dev 2010-06-01 21:13:20 -05:00
kimd
387942e68d Added search by location to the Gallery (RFE 11504) 2010-06-01 16:23:48 -05:00
khenn
b5e20607f8 Added index to inbox_messageState. This table can grow very large on some sites and cause queries to get unread messages to slow down to 3-5 seconds. This index corrects that problem. 2010-05-23 08:24:10 -05:00
Colin Kuskie
ce8b1dc63a Remove an old database column from EMS mark 1. 2010-05-20 16:00:48 -07:00
kimd
77e331a129 Added more owner information to the gallery (RFE 9774) 2010-05-20 13:25:46 -05:00
Colin Kuskie
e03f754bce Fix the name of the ConvertUTCToTZ macro in config files. Fixes bug #11576. 2010-05-19 08:38:22 -07:00
Colin Kuskie
d3cd81f759 Upgrade the template for adding an archive to handle sorting order. Fixes bug #11577 2010-05-19 08:29:14 -07:00
Colin Kuskie
5a0d7ddf64 Ready for 7.9.6 development cycle. 2010-05-18 21:18:31 -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
Colin Kuskie
22a6ce339e Remove 7.8 upgrade files from 7.9 2010-05-18 11:34:18 -07:00
Doug Bell
96a52c5748 Merge remote branch 'spunky/rfe11517' 2010-05-18 11:24:23 -05:00
khenn
d99e4cc415 put checks in before alter groupGroupings table 2010-05-17 09:59:51 -05:00
Colin Kuskie
d2b6a7fff1 Fix a bug in how groups using IP filters cache the user Visitor. Also, significant speedups in group lookups. Fixes bug #11552. 2010-05-16 22:11:33 -07:00
khenn
b0c7c1162d Added sendNotification flag to WebGUI::Friends::rejectAddRequest. Added setting which supresses friend rejection notices from the inbox. 2010-05-13 17:15:41 -05:00
Colin Kuskie
55d55b4eee Install better error handling code into RequestApprovalForVersionTag. Do not generate leading commas in workflow instance scratch data. 2010-05-11 16:21:32 -07:00
Colin Kuskie
007391d5f1 Label the form field for entering in sub-keywords. 2010-05-10 10:55:02 -07:00