Commit graph

111 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
Doug Bell
ef319ea2a2 fix cleanup 2010-07-13 13:12:47 -05:00
Doug Bell
ab7e98d08c test changes to updating serialize asset props 2010-07-13 13:12:47 -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
Doug Bell
55dbab152c fix cleanup 2010-07-09 11:04:20 -05:00
Doug Bell
1ff4a26ea4 test changes to updating serialize asset props 2010-07-01 13:11:55 -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
6c3369d0cb Revert "use temp config file for testing"
This reverts commit 9b725c6d42.
2010-06-14 15:19:54 -07:00
Graham Knop
1c2d10a8b3 fix another test 2010-06-14 10:16:54 -05:00
Graham Knop
6f102973dd use temp config file for testing 2010-06-10 18:58:25 -05:00
Graham Knop
9b725c6d42 use temp config file for testing 2010-06-10 10:09:54 -05:00
Colin Kuskie
23183276e3 Document change in handling sequences of dashes. 2010-05-16 22:16:18 -07:00
Colin Kuskie
0e7ce2c0e3 Update Asset/Asset.t for new fixUrl code. 2010-05-16 20:55:28 -07:00
Colin Kuskie
923e03f048 Add a method for getViewCacheKey. Update number of tests. 2010-05-09 19:03:20 -07:00
Colin Kuskie
c0361fda0e Remove test for old RSS method that no longer exists. 2010-04-19 08:41:48 -07:00
Graham Knop
2400f19099 Merge branch 'master' into WebGUI8 2010-04-13 07:50:02 -05:00
Colin Kuskie
006570a05a newByUrl should throw an exception. Test it. 2010-01-29 17:35:19 -08:00
Colin Kuskie
451eb33f0f Fix requestAutoCommit. All tests in t/Asset/Asset.t passing. 2010-01-22 15:10:23 -08:00
Colin Kuskie
e5affbd0c2 Add tagId property, fix cloneFromDb. Fix several tests. 2010-01-22 11:42:05 -08:00
Colin Kuskie
5c3a3d440b Fix inheritUrlFromParent, using trigger instead of around. 2010-01-22 11:07:46 -08:00
Colin Kuskie
6573884db6 Add exceptions to newPending. Change it to use newById instead of new. Tweak some messages and tests. 2010-01-22 08:40:49 -08:00
Colin Kuskie
f798ae533b remove newByDynamicClass tests, which was replaced by newById 2010-01-21 21:44:28 -08:00
Colin Kuskie
04ed78e8f1 Remove use of getAttribute from Asset.pm. Tweak a few tests. 2010-01-21 21:06:58 -08:00
Colin Kuskie
143e2e0d7b pull permission tests out of Asset.t. Fix getName. 2010-01-21 20:45:58 -08:00
Colin Kuskie
52d5883b77 More exceptions and tests for Asset.pm 2010-01-21 19:52:48 -08:00
Colin Kuskie
9004007b0e Changing undef to exceptions in Asset.pm 2010-01-21 19:10:56 -08:00
Colin Kuskie
56eadab746 Update test for new Moose API. 2010-01-20 21:54:29 -08:00
Colin Kuskie
27a7c099ba fix: getIsa returns undef for pending assets.
Add a new option flag to getIsa, called returnAll.  If returnAll = 1, then
assets are returned regardless of status.  Otherwise, getIsa will only
return committed assets.
2009-12-08 17:22:59 -08:00
JT Smith
3938f9ff0d removed last remnants of old definition 2009-10-22 17:00:45 -05:00
Colin Kuskie
2250ab0452 Fix a typo in Asset->checkView, which redirected assets in the clipboard to the trash instead. Fixes bug #11139. 2009-10-16 14:31:26 -07:00
Graham Knop
60a4a9b140 mark $session->datetime->time as deprecated and remove its use from core code 2009-10-05 20:56:37 -05:00
Doug Bell
5c03cfbfbe fixed #10544: Child assets under uncommitted parents 2009-10-02 01:03:34 -05:00
Colin Kuskie
9d438f7266 Fix bad URLs from happening when inheritUrlFromParent is used. Fixes bug #11011 2009-09-22 11:45:06 -07:00
Colin Kuskie
2948e68781 Fix 10939, commit with approval breaks on assets with autocommit children, Post, Story, Wiki, Event, etc.
Encapsulate a new method to get a fresh asset from the db.  With tests.
2009-09-08 21:17:41 -07:00
Graham Knop
39127b7ec0 add tests for url extensions 2009-08-19 18:05:28 +00:00
Colin Kuskie
2d64657165 Use WebGUI::Test rollback methods instead of an END block. 2009-07-09 20:31:25 +00:00
Colin Kuskie
f0eaa51d3a If adding an asset is added to another asset with an open version tag, put the
new asset in that version tag, too.
2009-06-23 19:32:40 +00:00
Colin Kuskie
61b4e1e826 Never delete an asset property key. 2009-06-20 00:16:34 +00:00
Colin Kuskie
c93075519f Update test to work with new fixUrl code. 2009-05-07 16:42:04 +00:00
Colin Kuskie
39607fc208 Another batch of clean-ups for users and groups. 2009-05-01 02:48:18 +00:00
Colin Kuskie
f9e3c0c99c Check what happens with URLS with an initial dot in them 2009-04-24 16:53:35 +00:00
Colin Kuskie
1edaca4ed2 Merge up to 10305 2009-04-13 17:04:23 +00:00
Colin Kuskie
4c1307e3d0 merge to 10219 2009-04-08 16:35:31 +00:00
Graham Knop
24da723629 updating copyright year 2009-02-20 23:47:30 +00:00
Colin Kuskie
665284392f forward porting quotes in asset title fixTitle test 2008-12-11 19:20:12 +00:00
Colin Kuskie
13eb87ffe5 forward porting fix for non-unique separator strings, ~~~, #8543 2008-11-21 23:07:05 +00:00
Colin Kuskie
79cbb85285 fix Asset.t. Safe references are not always safe 2008-09-30 18:23:17 +00:00