Commit graph

34 commits

Author SHA1 Message Date
Colin Kuskie
4bfabb9469 Make version tags mandatory again. 2011-10-25 19:44:58 -07: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
Doug Bell
1fa911029d Merge commit '1966cc02a7'
Conflicts:
	lib/WebGUI/Asset/Wobject/Thingy.pm
2011-05-20 14:58:43 -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
Colin Kuskie
61534779d5 Add new MapPoint code for geolocation, Thingy searching and indexing and a macro for rendering thing data outside of the Thingy. 2011-05-02 13:49:18 -07:00
Doug Bell
ae7528b8ef migrate Thingy import from csv to FormBuilder 2011-02-10 16:34:03 -06:00
Doug Bell
963227b571 migrate Thingy editField to FormBuilder 2011-02-10 15:48:29 -06:00
Colin Kuskie
3e0da41f0a Allow for File and Image subclasses to be handled gracefully by the Thingy. 2011-01-02 12:57:54 -08:00
Doug Bell
7c14d1e6c4 almost done fixing addRevision tests 2010-12-03 15:01:31 -06:00
Colin Kuskie
e5adc07a05 Remove getStatus and setStatus in Session::Http, and replace them with status, from $session->status. 2010-11-21 21:11:41 -08:00
Graham Knop
a95ef168cc remove use of FindBin in tests 2010-09-01 14:05:53 -05:00
Colin Kuskie
b12c719b09 Thingy add/edit via AJAX returned nothing useful, and lied about error status. Fixes bug #11781. 2010-08-25 11:44:00 -07:00
Colin Kuskie
05c287cfc7 Thingy add/edit via AJAX returned nothing useful, and lied about error status. Fixes bug #11781. 2010-08-15 23:16:53 -07:00
Graham Knop
49be76247e mock asset test package 2010-06-10 23:56:40 -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
5fd30d8d84 Revert "Separating ThingRecord object from Thingy"
This reverts commit df84c60d6a.
2009-11-17 12:12:19 -08:00
Colin Kuskie
a37f69cc04 Revert "Separating Thing object from Thingy"
This reverts commit 3d88789659.
2009-11-17 12:12:08 -08:00
Yung Han Khoe
3d88789659 Separating Thing object from Thingy 2009-11-16 17:37:18 +01:00
Yung Han Khoe
df84c60d6a Separating ThingRecord object from Thingy 2009-11-16 11:53:14 +01:00
Colin Kuskie
536ac6cdc7 Fix bugs in how Thingy handles displaying dates to the user in view and search modes. 2009-10-01 13:04:58 -07:00
Colin Kuskie
ec6887b0ac Make thingy respect thing permissions when generating form field for other things. Fixes bug #11032 2009-09-25 16:58:26 -07:00
Colin Kuskie
8395d090fa Show thingy controls when maxEntriesPerUser is reached. Fixes bug #10950. 2009-09-16 21:58:24 -07:00
Graham Knop
12298aa7ca fix thingy test for field type being provided provided 2009-04-30 20:55:13 +00:00
Yung Han Khoe
a57fc80a18 Added rfe #9098 Thingy thing-copy function and added some context to thingy's i18n 2009-03-24 17:08:33 +00:00
Graham Knop
24da723629 updating copyright year 2009-02-20 23:47:30 +00:00
Graham Knop
bf9bd2f0d2 use proper JSON encoding/decoding 2009-02-10 21:41:36 +00:00
Graham Knop
0487acca1d fix Thingy test to account for new template options 2008-12-16 21:13:21 +00:00
Graham Knop
9856cc5904 clean up tests some 2008-10-14 22:03:41 +00:00
Yung Han Khoe
1378ab0d41 Added field_loop to output of Thingy's www_getThingViaAjax method 2008-09-25 20:05:17 +00:00
Yung Han Khoe
976834a5a4 small changes in Thingy's web services methods, added Thingy tests 2008-09-24 16:24:14 +00:00
Patrick Donelan
dd5d0639b2 RFE - Teach Thingy to be a Web Service (http://www.plainblack.com/rfe/request-for-enhancement/teach-thingy-to-be-a-web-service) [Yung] 2008-09-24 07:10:46 +00:00
Yung Han Khoe
f70549720b fix: defaultThingId was not automatically set after creating first thing, also added a test for this. 2008-03-15 15:47:55 +00:00
Yung Han Khoe
9de7e34112 add: Thingy asset 2008-03-13 19:06:18 +00:00