Commit graph

23 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
e34d1ad38c shortcut no longer overrides getToolbar, so stop testing it 2011-05-05 15:54:14 -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
6931fd471e all tests run individually 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
Colin Kuskie
6c3369d0cb Revert "use temp config file for testing"
This reverts commit 9b725c6d42.
2010-06-14 15:19:54 -07: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
7ba305109a Set a trigger for the snippet. Update tests for snippet packing. 2010-05-09 21:44:18 -07:00
Colin Kuskie
ea53dcc037 Update version for JavaScript::Packed to handle some gnarly JS. Fixes bug #11034. 2010-01-19 09:06:35 -08:00
Colin Kuskie
17297f4fe6 Fix cache setting and cleaning up issues in the Snippet. Fixes bug #11259 2009-11-20 11:34:13 -08:00
Colin Kuskie
d6400799aa Allow snippets to be really empty, without showing the Page Not Found screen. 2009-07-06 19:35:00 +00:00
Graham Knop
24da723629 updating copyright year 2009-02-20 23:47:30 +00:00
Colin Kuskie
e3c77d4e80 Add a test for evaluating templates and macros in the right order
in the Snippet.  Fix a bug with that.
2009-01-12 22:23:41 +00:00
Colin Kuskie
0c2ca8184c final asssetManager i18n re: 4214 2008-11-14 23:44:30 +00:00
JT Smith
93b5ca16e4 updating copyright year 2008-02-07 23:28:18 +00:00
JT Smith
40a4c3c487 fixing bugs reported by tests 2007-07-29 21:26:35 +00:00
Colin Kuskie
83310ba311 update copyright on tests 2007-07-07 03:56:44 +00:00
Colin Kuskie
0a7e06edca Remove extra arguments to rollback. Not sure how those got added
in the first place.
Fix the WikiPage, which was not cleaning up after itself.
2007-05-29 22:52:52 +00:00
Roy Johnson
1cae999b60 Two new tests for the snipper 2006-12-07 01:07:01 +00:00
Roy Johnson
2733d4f9a9 Two new tests for snippet. Almost at 100% coverage for snippet now. 2006-11-08 20:42:36 +00:00
Roy Johnson
19aa2b854e merge tests from branch into HEAD 2006-11-02 03:01:32 +00:00
Roy Johnson
153b13207f merging tests and bug fixes from 7.1 branch
- fix Asset.t cache test
- fix Asset.t purgeCache test
- add Session.t test suite
2006-10-26 19:14:45 +00:00