Commit graph

56 commits

Author SHA1 Message Date
Colin Kuskie
b323f74121 Update copyright notice 2011-12-28 11:30:38 -08:00
Colin Kuskie
4bfabb9469 Make version tags mandatory again. 2011-10-25 19:44:58 -07:00
Doug Bell
0c5acb697b Merge commit 'v7.10.18' into 8
Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	docs/templates.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset/File.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/AssetExportHtml.pm
	lib/WebGUI/Content/AssetManager.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/Macro/AssetProxy.pm
	lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
	lib/WebGUI/Storage.pm
	t/Asset/AssetExportHtml.t
	t/Asset/Story.t
	t/Shop/TaxDriver/Generic.t
	t/Storage.t
2011-06-21 16:03:49 -05:00
Doug Bell
795d88e7e5 Merge commit 'v7.10.17' into 8
Conflicts:
	docs/upgrades/upgrade_7.9.13-7.10.0.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset/Template/TemplateToolkit.pm
	lib/WebGUI/Asset/Wobject/AssetReport.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/Form/Captcha.pm
	lib/WebGUI/Macro/AdminBar.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/PayDriver.pm
	lib/WebGUI/Shop/PayDriver/PayPal/ExpressCheckout.pm
	lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
	lib/WebGUI/Shop/Transaction.pm
	lib/WebGUI/Workflow/Instance.pm
	lib/WebGUI/Workflow/Spectre.pm
	lib/WebGUI/i18n/English/PayDriver.pm
	t/Asset/Asset.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/Wobject/Thingy.t
2011-06-17 20:13:41 -05:00
Colin Kuskie
b866601efa Fix the number of tests in Story.t, Test::Harness 3.x cannot come quickly enough. 2011-05-31 15:38:01 -07:00
Colin Kuskie
ab1b6aa4fd Fix photo JSON handling in the story, where the data is cached incorrectly. Fixes bug #12136 2011-05-31 15:16:02 -07:00
Colin Kuskie
d796412469 Update Asset/Story.t for changes to exportGetRelatedAssetIds now exporting the container as well. 2011-05-16 21:32:48 -07: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
Paul Driver
f8021c3d3d rfe #12093: Remotely stored photos for Story assets 2011-04-05 15:16:45 -05:00
Paul Driver
76e9693f4b Export related assets 2011-04-04 18:47:37 -05:00
Colin Kuskie
bb584ec910 Fix stories linking to keyword pages after export. Fixes bug #12035. 2011-02-08 19:11:32 -08:00
Colin Kuskie
4881b83a05 Refix the Story.t test to handle a different parent. 2011-01-04 13:43:12 -08:00
Colin Kuskie
78a12c18e9 No debug in Test::More, using diag instead. 2011-01-04 10:45:25 -08:00
Doug Bell
f43541c5c9 done with addRevision tests
remaining fails are other stuff and I need to move on
2010-12-03 15:01:31 -06: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
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
385931aaab Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing. 2010-06-27 22:32:31 -07:00
Colin Kuskie
55ec1788ed Test fixes for cross repo-mixup. 2010-06-26 13:07:53 -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
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
4dc9cbae3e Fix storageId cleanup, had a syntax error in perl 5.10.1 2010-06-10 19:51:55 -07:00
Graham Knop
4c18ba3563 convert all test cleanup to addToCleanup 2010-06-10 18:47:54 -05:00
Graham Knop
492259c93a remove useless test END blocks 2010-06-10 18:47:53 -05:00
Graham Knop
b832deecd1 convert all cleanup methods to addToCleanup 2010-06-10 10:09:53 -05:00
Colin Kuskie
05ce650a1a Update Story test for new accessors. 2010-06-09 19:41:49 -07:00
Colin Kuskie
1770e3945c END block cleanups. 2010-06-08 08:39:43 -07:00
Colin Kuskie
c9dc084ed6 Stories have to pass along absolute links in their RSS feeds. Fixes bug #11606 2010-06-07 11:44:30 -07:00
Colin Kuskie
7a1487be55 Added GUID and pubDate entries to Stories. Updated tests. Fixes bug #11580 2010-05-25 11:42:38 -07:00
Colin Kuskie
e69a26db8c Update test to remove use_ok, SKIP. 2010-05-13 21:14:07 -07:00
Colin Kuskie
08f6bd8b58 Fix description field of the Story RSS feed. Fixes bug #11112 2009-10-11 19:03:55 -07:00
Graham Knop
67b729fee0 use note instead of diag in tests for non-error debug output 2009-09-23 08:29:05 -05:00
Colin Kuskie
92815bb75d Change www_delete and www_cut to use either the container, or the parent
as the asset to return the user to after their actions.
Subclass getContainer in the Story, and alias it to getArchive.
Fixes bug 10657.
2009-08-14 19:43:14 +00:00
Colin Kuskie
4226ef211f Remove autocommit from addRev in Story, because it committed the
story before the keywords were set, which messed up searching.
Adjust tests to request autocommit on all submitted stories.
2009-07-24 17:26:50 +00:00
Colin Kuskie
1c40934876 Fix a typo in the story link back to the archive, to limit display to only 1 keyword. 2009-07-16 03:10:27 +00:00
Colin Kuskie
a4be42a7ce Fix bugs with resizing photos on upload. 2009-06-23 00:07:16 +00:00
Colin Kuskie
83497b773e Fix Story permissions so that admin need not be turned on.
canEdit is now determined by the Story and the parent StoryArchive.
With tests, and template changes.
2009-05-28 04:15:50 +00:00
Colin Kuskie
4768a8687e Add storage locations to package data for a Story. With tests. 2009-04-13 17:56:44 +00:00
Colin Kuskie
314a12def2 Add an autoclean-up method to WebGUI::Test, and convert the Story test
to use it.
2009-04-13 17:33:42 +00:00
Colin Kuskie
fa2e5c2c90 Add valid storageId checks for duplication, since '' ne storageId. 2009-04-13 16:38:26 +00:00
Colin Kuskie
5729a40ab2 Add tests that _really_ check for duplicated storage locations. 2009-04-13 16:36:37 +00:00
Colin Kuskie
ec4713855a Convert Story asset to use Class::C3 properly.
Add a method to duplicate the photo collateral JSON data, with tests.
Make addRevision and duplicate use that method.
2009-04-13 16:33:24 +00:00
Colin Kuskie
9ccdd08a01 Add tests for title vs headline in RSS. 2009-04-09 14:52:54 +00:00
Colin Kuskie
3853e4dd02 Add a method to return RSS data for a Story, with tests. 2009-04-08 22:28:59 +00:00
Colin Kuskie
cecfff40fe Update Story to use awesome new Keywords 2009-04-08 16:41:51 +00:00
Colin Kuskie
8b071cb892 Add template variables for determining if a story has photos, and how many it has.
Tests, help, i18n.
2009-03-23 15:08:54 +00:00
Colin Kuskie
c8da6cfe26 Fix a bug where the cached data structure was not deleted.
Add template variables for showing the uploaded photos.
Add tests for the template variables.
Add a form field to delete the photo with all data.
2009-03-23 05:01:36 +00:00
Colin Kuskie
3d5f5b04c1 Rearrange form fields in default edit story template.
Change photo JSON blob to be an array ref, not a hash ref.
Code for saving new photo data.
2009-03-20 21:42:47 +00:00
Colin Kuskie
8e7fcd0e6c Remove quotes from Help vars.
Add crumb trail template variables to the Story.
Fix links for keywords in the Story.
2009-03-20 03:46:10 +00:00
Colin Kuskie
4867750fd9 Beginning of Topic showing an Story.
Story now has a crumb trail.  Needs to be added to template vars and to template.
2009-03-20 00:08:47 +00:00