Commit graph

3121 commits

Author SHA1 Message Date
Colin Kuskie
3b418ede3c Merge commit 'v7.10.24' into WebGUI8 2012-01-17 15:03:45 -08:00
Colin Kuskie
e5f987babf Fix a bad nested macro in the Shop's my purchases template. Fixes bug #12312 2012-01-04 11:23:41 -08:00
Colin Kuskie
200494b28d Fix an edge case where invalid JSON is written the database. Fixes bug #12303. 2011-11-20 22:24:14 -08:00
Colin Kuskie
26244635e1 These upgrades are in the wrong branch. 2011-11-07 13:59:51 -08:00
Colin Kuskie
a2a821822d Merge commit 'v7.10.23' into WebGUI8. Tests need fixing. 2011-11-02 11:12:18 -07:00
Colin Kuskie
431cd280a4 Merge commit 'v7.10.22' into WebGUI8 2011-10-31 20:13:01 -07:00
Colin Kuskie
4855816a29 Merge commit 'v7.10.21' into WebGUI8. Also, add POD and fix broken tests. 2011-10-27 16:45:19 -07:00
Colin Kuskie
fdb979ca8a Merge commit 'v7.10.20' into WebGUI8 2011-10-26 15:02:51 -07:00
Colin Kuskie
4fea10a1f5 Merge commit 'v7.10.19' into WebGUI8 2011-10-25 20:31:50 -07:00
Colin Kuskie
b6c4adc8e0 Fix bucket name truncation in the bucket log, and don't forget to check the delta interval when summarizing. 2011-10-20 20:25:16 -07:00
Colin Kuskie
63c31404c2 Allow a redirect to be sent to the user that cannot be calculated when creating the Fork object. This is useful for Forks that build files to be downloaded. 2011-10-15 13:53:33 -07:00
Colin Kuskie
3832e130dc Make the upgrade sub safe for reinstalls. 2011-10-06 14:51:35 -07:00
Colin Kuskie
6ed275b133 Rework PA again to not try and sort the passiveLog. Instead, we iterate and store "last" data in a new database table. 2011-10-06 10:22:39 -07:00
Colin Kuskie
c1945a1dd0 Fix template logic which was hiding the PoS form in the cart. Fixes bug #12268. 2011-10-04 10:53:46 -07:00
Colin Kuskie
ec00e867a9 Remove bad template code from calendar search template. Fixes bug #12256 2011-09-23 13:00:44 -07:00
Colin Kuskie
77a2a09d3c Ready to 7.10.24 development. 2011-09-12 18:39:20 -07:00
Colin Kuskie
3c44dae9e9 Internationalize a label in the My Purchases account plugin template. Fixes bug #12241 2011-08-31 16:49:56 -07:00
Colin Kuskie
7a89bf19c7 Remove a template attachment in the Search namespace. Add tests to check all other template attachments. Fixes bug #12238. 2011-08-28 17:28:47 -07:00
Colin Kuskie
8ed3eba9bb Allow multiple stock assets to be placed on the same page by making div ID's and JS function names unique. Fixes bug #12225. 2011-08-21 19:52:38 -07:00
Colin Kuskie
8211232e32 Ready for 7.10.23 development 2011-08-16 18:57:31 -07:00
Colin Kuskie
52cfc73033 Alter the merged upgrade script to accept the merged upgrade package. 2011-08-16 16:32:03 -07:00
Colin Kuskie
5ef5267110 Added merged package for upgrading. 2011-08-16 16:29:18 -07:00
Colin Kuskie
f85c7dd03e Final batch of upgrade subroutine bug fixes. 2011-08-16 15:55:51 -07:00
Colin Kuskie
5a4369ea96 More upgrade fixes. 2011-08-16 15:48:52 -07:00
Colin Kuskie
b5ff886704 First batch of cleanups for the merged upgrade script. 2011-08-16 15:45:36 -07:00
Colin Kuskie
acfe7e775f Add the merged upgrade script. 2011-08-16 15:36:27 -07:00
Colin Kuskie
b2e32612d7 Fix rendering issues with the Thing drop down list in the CrystalX theme. Fixes bug #12173 2011-08-15 13:39:04 -07:00
Colin Kuskie
428ea58327 Add better support for user profile fields for addresses to the Cart and the EMS. 2011-08-11 16:27:29 -07:00
Colin Kuskie
1d54196f44 Add payment driver for Authorize.net. i18n, upgrade script, config file changes, and new template. 2011-07-27 13:24:30 -07:00
Colin Kuskie
5e40bf4528 Ready for 7.10.21 development 2011-07-25 21:14:05 -07:00
Paul Driver
7b1e385dd3 Added new setting - Enable Users after Anonymous Registration? 2011-07-25 14:07:01 -05:00
Paul Driver
182fc16021 added WaitForUserConfirmation activity 2011-07-25 14:07:01 -05:00
Colin Kuskie
50ddc03cd8 Fix the HTML in the default forum notification template. Fixes bug #12204 2011-07-22 21:31:38 -07:00
Colin Kuskie
39165c5485 Ready for 7.10.20 development. 2011-07-11 21:03:13 -07:00
Colin Kuskie
2bcda0c9f5 Change the generic tax driver to remove spaces around commas when adding a new row. Add tests and a convenience method for getting one line of tax information. Upgrade sub fixes any information already in the db. 2011-06-30 16:20:14 -07:00
Scott Walters
6ac46be8bd Missed upgrade script for the FormField macro. Here's it. 2011-06-30 14:41:50 -04:00
Colin Kuskie
3fa9d82bcd Ready for 7.10.20 development. 2011-06-27 22:07:50 -07:00
Colin Kuskie
204108e178 Remove the Underground User style template, and fix the problem is tried to fix by changing the navigation. Fixes bug #12172 2011-06-27 18:06:23 -07:00
Colin Kuskie
f728b22843 Do not append ;adminId to the URL stored for calendar feeds. Add upgrade code to fixing existing, broken feeds. Fixes bug #12164 2011-06-27 14:40:46 -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
4d0e87a8d9 add ticket limits to badge groups. add ticket and badge metadata to templates 2011-06-20 18:39:45 -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
a2425bdbc4 Ready for 7.10.19 development. 2011-06-13 20:31:05 -07:00
Colin Kuskie
8b3877c34e Update the default CS notification template. 2011-06-13 13:46:01 -07:00
Paul Driver
1ff1ffe423 rfe #12159: Asset Manager sort preferences 2011-06-13 13:25:01 -05:00
Colin Kuskie
926cfd18e4 Ready for 7.10.18 development. 2011-05-24 20:54:32 -07:00
Graham Knop
529743ff8f remove old upgrades 2011-05-24 19:47:57 -05:00
Doug Bell
1fa911029d Merge commit '1966cc02a7'
Conflicts:
	lib/WebGUI/Asset/Wobject/Thingy.pm
2011-05-20 14:58:43 -05:00
Colin Kuskie
bba52ddee1 Ready for 7.10.17 development. 2011-05-16 22:19:39 -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