Commit graph

19 commits

Author SHA1 Message Date
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
Doug Bell
a476f09e12 Shelf no longer has importProducts or exportProducts, they're AssetHelpers 2011-05-05 16:03:05 -05:00
Paul Driver
5c20e9c0be Fixing a bunch of tests not to rely on HT being default parser 2011-04-04 18:47:18 -05:00
Colin Kuskie
67264660f7 Fix bad characters in the price column when importing products into a Shelf. Fixes bug #12001. 2011-01-03 19:13:59 -08:00
Doug Bell
7c14d1e6c4 almost done fixing addRevision tests 2010-12-03 15:01:31 -06:00
Graham Knop
a95ef168cc remove use of FindBin in tests 2010-09-01 14:05:53 -05:00
Graham Knop
4c18ba3563 convert all test cleanup to addToCleanup 2010-06-10 18:47:54 -05:00
Graham Knop
b832deecd1 convert all cleanup methods to addToCleanup 2010-06-10 10:09:53 -05:00
Colin Kuskie
44c6048da4 Update test for exception handling. 2010-03-03 11:10:16 -08:00
Colin Kuskie
f2bd5d8e48 The shelf now checks for viewing permissions of the products and shelves that it displays.
Template with i18n feedback for users.
2009-07-17 21:01:55 +00:00
Colin Kuskie
f621c1c0eb Make the Shelf set and update the menuTitle, too. 2009-03-17 03:16:52 +00:00
Graham Knop
24da723629 updating copyright year 2009-02-20 23:47:30 +00:00
Colin Kuskie
e2101ad8d2 Products imported by the Shelf do not have good URLs. 2008-11-24 22:19:06 +00:00
Colin Kuskie
a61bd107fa Add support for the original sku entry in the header. 2008-09-29 23:26:34 +00:00
Colin Kuskie
de889434da Let the product importer import files with windows style line endings. 2008-09-29 00:57:02 +00:00
Colin Kuskie
79c5425bcf Fix product exporting and importing through the Shelf.
Note that sku entries in the import and export file are now varSku.
2008-09-28 23:59:26 +00:00
Colin Kuskie
aaa1e0ab0e add a test for importing product tables when the headers and fields are quoted 2008-09-28 05:00:57 +00:00
Colin Kuskie
0f312d69b2 fix leaking products and shelves in test 2008-09-27 21:18:24 +00:00
Colin Kuskie
29445ee1df move Shop/Products tests into Asset/Wobject/Shelf 2008-07-23 15:45:15 +00:00
Renamed from t/Shop/Products.t (Browse further)