Commit graph

180 commits

Author SHA1 Message Date
Doug Bell
d15891dbb9 fix template parser and attachments fields 2011-07-06 19:16:01 -05:00
Doug Bell
cc26d97805 fix namespace issues with templates 2011-07-06 18:27:33 -05:00
Doug Bell
f797429b5f clarify docs 2011-06-24 15:09:25 -05:00
Doug Bell
9a90ad6d2f add forms to templates to work directly with FormBuilder objects 2011-06-24 15:08:51 -05:00
Doug Bell
677ac978b6 Merge branch 'WebGUI8' of github.com:plainblack/webgui into 8
Conflicts:
	lib/WebGUI.pm
	lib/WebGUI/Auth/WebGUI.pm
	sbin/findBrokenAssets.pl
	sbin/testEnvironment.pl
2011-05-13 18:20:52 -05:00
Doug Bell
277faae8a1 Merge commit 'v7.10.15' into 8
Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	docs/templates.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Event.pm
	lib/WebGUI/Asset/File.pm
	lib/WebGUI/Asset/MapPoint.pm
	lib/WebGUI/Asset/RichEdit.pm
	lib/WebGUI/Asset/Sku/Product.pm
	lib/WebGUI/Asset/Snippet.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Template/TemplateToolkit.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	lib/WebGUI/Asset/Wobject/Collaboration.pm
	lib/WebGUI/Asset/Wobject/Dashboard.pm
	lib/WebGUI/Asset/Wobject/DataForm.pm
	lib/WebGUI/Asset/Wobject/Folder.pm
	lib/WebGUI/Asset/Wobject/Map.pm
	lib/WebGUI/Asset/Wobject/Search.pm
	lib/WebGUI/Asset/Wobject/Shelf.pm
	lib/WebGUI/Asset/Wobject/StockData.pm
	lib/WebGUI/Asset/Wobject/StoryTopic.pm
	lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/Asset/Wobject/WeatherData.pm
	lib/WebGUI/AssetClipboard.pm
	lib/WebGUI/AssetCollateral/DataForm/Entry.pm
	lib/WebGUI/AssetExportHtml.pm
	lib/WebGUI/AssetLineage.pm
	lib/WebGUI/AssetMetaData.pm
	lib/WebGUI/AssetTrash.pm
	lib/WebGUI/AssetVersioning.pm
	lib/WebGUI/Auth.pm
	lib/WebGUI/Cache/CHI.pm
	lib/WebGUI/Content/AssetManager.pm
	lib/WebGUI/Fork/ProgressBar.pm
	lib/WebGUI/Form/JsonTable.pm
	lib/WebGUI/Form/TimeField.pm
	lib/WebGUI/Form/Zipcode.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/International.pm
	lib/WebGUI/Macro/AssetProxy.pm
	lib/WebGUI/Macro/FileUrl.pm
	lib/WebGUI/Operation/SSO.pm
	lib/WebGUI/Operation/User.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Transaction.pm
	lib/WebGUI/Shop/TransactionItem.pm
	lib/WebGUI/Test.pm
	lib/WebGUI/URL/Content.pm
	lib/WebGUI/URL/Uploads.pm
	lib/WebGUI/User.pm
	lib/WebGUI/Workflow/Activity/ExtendCalendarRecurrences.pm
	lib/WebGUI/Workflow/Activity/SendNewsletters.pm
	lib/WebGUI/i18n/English/Asset.pm
	lib/WebGUI/i18n/English/WebGUI.pm
	sbin/installClass.pl
	sbin/rebuildLineage.pl
	sbin/search.pl
	sbin/testEnvironment.pl
	t/Asset/Asset.t
	t/Asset/AssetClipboard.t
	t/Asset/AssetLineage.t
	t/Asset/AssetMetaData.t
	t/Asset/Event.t
	t/Asset/File.t
	t/Asset/File/Image.t
	t/Asset/Post/notification.t
	t/Asset/Sku.t
	t/Asset/Story.t
	t/Asset/Template.t
	t/Asset/Wobject/Collaboration/templateVariables.t
	t/Asset/Wobject/Collaboration/unarchiveAll.t
	t/Asset/Wobject/Shelf.t
	t/Auth.t
	t/Macro/EditableToggle.t
	t/Macro/FilePump.t
	t/Shop/Cart.t
	t/Shop/Transaction.t
	t/Storage.t
	t/User.t
	t/Workflow.t
2011-05-13 18:15:11 -05:00
Scott Walters
57d2dbed56 WebGUI::Session::Http should go away (#11647)
Move logic out of WebGUI::Session::HTTP and into WebGUI::Session::Response /
::Request; deprecate more functions; change references in core to use
$session->response instead; fix tests that broke because of the change but
not one that merely generate the deprecated warning because I want to know
that the proxying of depricated methods is working.  These can be changed later.
2011-05-11 16:17:54 -04:00
Doug Bell
db9753eb01 default www_edit now returns template. add errors to edit template 2011-04-20 17:49:49 -05:00
Doug Bell
adb67b2137 add style parameter to template assets to store a style template id 2011-04-07 21:49:23 -05:00
Doug Bell
13e8040190 add setParam, getParam, deleteParam to template assets 2011-04-07 20:46:21 -05:00
Paul Driver
3531c4d913 Snippets can now select a template parser
(instead of being restricted to the configured default)
2011-03-31 15:21:07 -05:00
Doug Bell
d8ef2ebe56 remove TabForm from use and documentation 2011-02-25 15:45:41 -06:00
Doug Bell
325dbad2a3 remove style wizard 2011-01-25 18:09:46 -06:00
Paul Driver
61245baaaa Fix template preview to work with chunked content and template post-processing (in Layout, for instance) 2011-01-06 14:35:56 -06:00
Paul Driver
41ac1f153e Template Preview button 2011-01-05 12:40:35 -06:00
Doug Bell
52919f7586 add function to replace var names for FormBuilder 2011-01-04 18:01:21 -06:00
Doug Bell
1866c593ea almost done fixing addRevision changes 2010-12-03 15:01:31 -06:00
Colin Kuskie
fd8f03a186 Change getMimeType and setMimeType to response->content_type. 2010-11-21 22:35:26 -08:00
Colin Kuskie
c4553012d1 Syntax clean. 2010-11-17 16:34:11 -08:00
Colin Kuskie
5f3014aaee Merge branch 'master' into WebGUI8. Merged up to 7.10.4 2010-11-03 09:47:36 -07:00
Doug Bell
97020f69bf fix 11941 cannot edit default templates 2010-11-01 16:06:07 -05:00
Doug Bell
199c4e4960 change ErrorHandler to Log 2010-10-27 12:50:12 -05:00
Paul Driver
895ce37917 Move trash functions to Fork 2010-10-06 08:54:17 -07:00
Colin Kuskie
e549df1b47 Keep comments when packing asset content, since it will also remove conditional comments for IE. Fixes bug #11876 2010-09-23 16:13:30 -07:00
Colin Kuskie
45e8cdc233 Restore addAttachments and restoreAttachments to the 7.x series. In 8.x, the object property will act like an arrayref, so they won't be necessary. Fixes bug #11861. 2010-09-23 16:11:36 -07:00
Colin Kuskie
0180b11064 Merge commit 'b8845e25fa' into WebGUI8. Up to 7.10.0 2010-09-22 07:58:06 -07:00
Colin Kuskie
86ecb10198 Keep comments when packing asset content, since it will also remove conditional comments for IE. Fixes bug #11876 2010-09-20 13:37:12 -07:00
Colin Kuskie
2eed74891a Restore addAttachments and restoreAttachments to the 7.x series. In 8.x, the object property will act like an arrayref, so they won't be necessary. Fixes bug #11861. 2010-09-14 10:42:59 -07:00
Graham Knop
ed04b99872 remove WebGUI::Utility 2010-09-07 13:18:49 -05:00
Graham Knop
6aa26c2e44 remove WebGUI::Utility::isIn 2010-09-07 12:33:15 -05:00
Colin Kuskie
b1adfd2621 Fix missing Attachment label in the Template. 2010-09-02 14:07:21 -07:00
Doug Bell
6857ad6355 add www_edit boilerplate
This will be removed when forms can be directly added to
templates and template objects can be passed around. Finally www_
methods will be extendible!
2010-08-13 16:40:27 -05:00
Colin Kuskie
3e8e2d452c Merge branch 'master' into WebGUI8. Merged up to 7.9.12 2010-08-13 12:25:19 -07:00
Doug Bell
4e9a2c07c2 fix possible vulnerability loading template parser 2010-08-11 15:37:34 -05:00
Doug Bell
752ea71279 fix Template edit form 2010-08-02 17:27:00 -05:00
Doug Bell
7c60833d4d remove instances of getValue in Template asset 2010-08-02 16:53:50 -05: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
30f3897fda Handle import of templates with old attachments the correct way. 2010-07-27 18:14:06 -07:00
Colin Kuskie
5bc83c4b17 If the User Function Style template is cut or deleted, use the Fail Safe template instead. Fixes bug #11729 2010-07-26 09:01:21 -07:00
Doug Bell
3934a6704c fix getEditForm 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
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
b4f47dba7b read template attachments from prior versions 2010-07-13 13:41:29 -05:00
Doug Bell
0b87ce3e65 fix package import problem 2010-07-13 13:20:41 -05:00
Doug Bell
65e9902001 migrate to JsonTable to edit template attachments 2010-07-13 13:12:46 -05:00
Doug Bell
60a813169a migrate attachments to JsonTable 2010-07-13 12:39:43 -05:00
Doug Bell
8de5ab0d53 fix attachmentsJson fieldType 2010-07-12 15:53:13 -05: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