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
8b13c387be
Add missing i18n for Thingy RFE for unique fields.
2011-06-13 16:05:02 -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
90b37da740
Fix more i18n issues with the RenderThingData macro. Addresses bug #12141
2011-05-25 08:49:12 -07:00
Colin Kuskie
595660e9e4
Tests for templateId and URL handling, some i18n for the RenderThingData macro.
2011-05-24 15:23:32 -07:00
Colin Kuskie
8bc944d526
Prevent the PayPal standard driver from being abused. Update POD and comments in several Shop files. Fix form labels for PayPal Express checkout driver. Fix a niggling bug with updating a transaction with a cart, twice. Fixes bug #12140 .
...
commit cef8c5bde10f793db0890dcfd18cbf20b0e69c90
Author: Colin Kuskie <colink@perldreamer.com>
Date: Tue May 24 11:52:48 2011 -0700
Build a Shop::Transaction.
commit c386079ac29fc70c1cc63d0c2844511ce9db553e
Author: Colin Kuskie <colink@perldreamer.com>
Date: Tue May 24 11:34:13 2011 -0700
Pull a session out of the object.
commit 59d780eb0ffcc82572491f85f08eb4ac04cab109
Author: Colin Kuskie <colink@perldreamer.com>
Date: Tue May 24 11:15:05 2011 -0700
Rework PayPalStd driver to create transaction before sending the user off to PayPal.
commit cd2683aa8595875f7c501f29c622abaf350e90f6
Author: Colin Kuskie <colink@perldreamer.com>
Date: Tue May 24 11:14:19 2011 -0700
Fix some comments to be more cleanly readable.
commit cf1fecfb916906c4d8ec8d33bd85c59b0aea3b7c
Author: Colin Kuskie <colink@perldreamer.com>
Date: Tue May 24 11:13:52 2011 -0700
Make the transaction optional when displaying a payment error.
commit f3c949e03a18ac513938f2ed483002c5304663d5
Author: Colin Kuskie <colink@perldreamer.com>
Date: Mon May 23 19:19:56 2011 -0700
Remove dead code.
commit 5ddcb49f094fd054f79da38c4a95dd86c55a157f
Author: Colin Kuskie <colink@perldreamer.com>
Date: Thu May 19 11:31:15 2011 -0700
If a transaction is updated with a cart object, remove all transationItems from the transaction before adding new ones.
commit 3315cb30a5c1fd4d583ce352cbc9022e52544404
Author: Colin Kuskie <colink@perldreamer.com>
Date: Thu May 19 11:30:58 2011 -0700
Remove duplicate entries from ExpressCheckout i18n
commit b46d5af528d7223d12ecbed383e798cfc376ad2a
Author: Colin Kuskie <colink@perldreamer.com>
Date: Mon May 23 16:07:33 2011 -0700
Fix the version number of the PayPal API we send. Add the serialized request to the log file. Fix i18n labels so it's clear which username and password to use.
commit 1604d375822eb013c633b72993fa524703a72127
Author: Colin Kuskie <colink@perldreamer.com>
Date: Wed May 18 15:50:42 2011 -0700
Fix copy/paste errors from other i18n modules into ExpressCheckout.
commit f2c958fc7128348a18a005bfbadf83457861d6e2
Author: Colin Kuskie <colink@perldreamer.com>
Date: Wed May 18 11:26:15 2011 -0700
Update out of date POD about checking out.
commit 61ca80b15701733a1a7c7eae5d825b161e0c71c1
Author: Colin Kuskie <colink@perldreamer.com>
Date: Mon May 23 16:05:09 2011 -0700
Fix documentation in appendCartVariables, and return the hash instead of $self.
commit d3b7341c44c924f395f8594c8ae77d8187170c9f
Author: Colin Kuskie <colink@perldreamer.com>
Date: Mon May 23 16:03:20 2011 -0700
Remove variables that were not being used.
commit 2913f96182a7630bce01998bb022d3ebf4842171
Author: Colin Kuskie <colink@perldreamer.com>
Date: Mon May 16 21:05:54 2011 -0700
Pull isRecurring directly from the Cart if creating/updating a transaction from one.
2011-05-24 11:57:16 -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
Colin Kuskie
3e161b3ead
Fix a typo in the new Map template help variables. Fixes bug #12121
2011-05-06 14:39:50 -07: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
Colin Kuskie
944c76040a
Make makeUrlCompliant as deprecated, and updated POD and subroutines accordingly.
2011-05-02 08:20:33 -07:00
Colin Kuskie
ef08d0d481
i18n the controls for the JsonTable form plugin. Fixes bug #12116
2011-04-21 19:54:18 -07:00
Doug Bell
54b8cfc5a9
default asset helpers are now i18ned
2011-04-20 19:08:56 -05:00
Colin Kuskie
cf36a1510f
When the Sku for an item no longer exists, do not show links to it. Check for bad skus in Transaction/www_viewItem. Provide variables to not show links when the skus do not exist. Handle existing links better by not returning the user to the home page, but to the transaction. Fixes bug #12107 .
2011-04-18 11:36:27 -07:00
Paul Driver
e901b95520
rfe #12108 : Mail to Group preference field
2011-04-15 12:21:16 -05:00
Doug Bell
d466e757e4
make Admin interface into a settings template
2011-04-13 17:51:18 -05:00
Colin Kuskie
96ee557586
Allow the Rich Editor used by the Carousel to be customized for each Carousel asset instead of inheriting the Editor from the site's Settings. Fixes bug #12100 .
2011-04-11 15:48:15 -07:00
Colin Kuskie
c515e65bed
Documentation on how to get a PDT Identity Token for PayPal standard checkout.
2011-04-06 16:35:16 -07: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
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
Paul Driver
c8098e2ca6
rfe #618 : Syndicated Content Asset: Make images in the downloaded RSS-feeds available in the template.
2011-03-30 09:52:55 -05:00
Doug Bell
1f0e527099
add 12079 Carousel auto play
2011-03-24 18:19:35 -05:00
Colin Kuskie
88797c1d6c
Add Asset Dashlets to Dashboard. Add required and static properties to Dashboard Assets. Add caching to StockData and WeatherData assets. Add LastModifiedBy macro. Add GroupManager to the Group form control.
2011-03-09 21:33:44 -08:00
Colin Kuskie
dae7a145eb
Better handling for collateral assets in the Product sku. Fixes bug #12072 .
2011-03-07 21:17:23 -08:00
Colin Kuskie
73a95e9627
Fix the accidental overriding of www_export in the Thing. Fixes bug #12066 .
2011-03-04 10:45:06 -08:00
Colin Kuskie
331ce02065
Update the default View Thing Data template to use the viewScreenTitle variable, and i18n the word "View". Update template docs to describe what viewScreenTitle really is. Fixes bug #12053 .
2011-02-28 09:44:10 -08:00
Doug Bell
8650e714b5
move createShortcut to an assetHelper
2011-02-25 15:45:42 -06:00
Paul Driver
ae3e49d622
Versioned Metadata
2011-02-17 14:46:50 -06:00
Colin Kuskie
f3e340fa3a
Rework the CS mail fetching interval so that it can't have crazy values like never, every second or yearly. Fixes bug #12043
2011-02-14 16:37:06 -08:00
Colin Kuskie
702de1e26a
Add the missing template variables for userDefined fields in the Map Point.
2011-02-09 09:07:26 -08:00
Colin Kuskie
2b15982caa
i18n the EU VAT TaxDriver screen. Fixes bug #12028 .
2011-01-24 08:59:46 -08:00
Paul Driver
2208864504
rfe #12016 for the top story as well
2011-01-11 10:09:58 -06:00
Doug Bell
2808a19670
fix 11988 dataform list view missing field control
2011-01-10 20:26:56 -06:00
Paul Driver
5fc7b42a88
Template help for the additional topic variables
2011-01-10 11:31:56 -06:00
Paul Driver
41ac1f153e
Template Preview button
2011-01-05 12:40:35 -06:00
Doug Bell
48f9687025
fix 11984 No JS allows invalid dates in Event
2010-12-08 14:32:47 -06:00
Doug Bell
0a32122643
Merge branch 'carousel'
...
Conflicts:
lib/WebGUI/Asset/RichEdit.pm
2010-12-07 17:23:10 -06:00
Colin Kuskie
dd7e6016dc
Add a workflow activity that reverifies that all subscribers to a CS can still view the CS, otherwise, remove them. Hook up the workflow to the update method in Collaboriation.pm and create an instance for it if the groupIdView changes. Add tests for the activity. Add a new workflow. Update the default WebGUI.conf.
2010-11-30 15:07:49 -08:00
Paul Driver
a4edea1e3c
Better integration of Fork into AssetHelpers, fork startup
2010-11-08 07:55:42 -06:00
Colin Kuskie
5f3014aaee
Merge branch 'master' into WebGUI8. Merged up to 7.10.4
2010-11-03 09:47:36 -07:00
Colin Kuskie
a90eadda7c
Merge commit ' bfe9780ce0' into WebGUI8. Merged up to 7.10.3
2010-11-02 14:49:33 -07:00
Paul Driver
7219e21f86
Merge branch 'fork'
2010-11-01 08:20:38 -05:00
Colin Kuskie
87326192a3
Merge commit ' 4635b91554' into WebGUI8. Syntax clean up to 7.10.2
2010-10-27 15:59:33 -07:00
Colin Kuskie
dcae5190da
Build a progress bar for exporting data from a Thing. Fixes bug #11925 .
2010-10-25 13:49:54 -07:00
Colin Kuskie
f159fab19b
Make the password recovery email templatable. Includes i18n, help docs, upgrade sub, template package and code. Fixes bug #11918 .
2010-10-19 15:22:42 -07:00
Colin Kuskie
3ad69de404
Template the emails sent out during content approval. Includes new template, i18n, Help docs upgrade sub and code. Fixes bug #11901 .
2010-10-18 13:53:33 -07:00
Colin Kuskie
2edec772e5
Conversion of UPS driver to Moose. Tests still failing.
2010-10-14 13:51:36 -07:00
Colin Kuskie
1ea5bf0800
Update the test, fix i18n instructions and plugin name.
2010-10-14 08:11:11 -07:00