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 |
|
Colin Kuskie
|
d4672a92f1
|
Consider search fields when doing search in a Thingy normally, or via Ajax. Fixes bug #12117.
|
2011-04-20 16:05:20 -07:00 |
|
Chris Hanson
|
bc00c4b6e0
|
fixed #12056: Adding a Thing always creates a table
|
2011-04-07 14:07:58 -05:00 |
|
Mary Hoerr
|
ee40a71770
|
Removed caching from www_export() Fixes bug #12050.
|
2011-03-10 16:38:00 -06:00 |
|
Colin Kuskie
|
41ebf01199
|
There's no need to check again if the asset exists when importing asset collateral data. Fixes bug #12060.
|
2011-03-07 16:31:19 -08:00 |
|
Colin Kuskie
|
78d27ad031
|
Revert "Thingy asset collateral import does not need to check for existance of the asset. If the asset doesn't exist, package import will create it or it will die. Fixes bug #12060."
This reverts commit 2c0334d709.
|
2011-03-07 08:50:24 -08:00 |
|
Colin Kuskie
|
2c0334d709
|
Thingy asset collateral import does not need to check for existance of the asset. If the asset doesn't exist, package import will create it or it will die. Fixes bug #12060.
|
2011-03-07 08:35:15 -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
|
e7e8cd43bf
|
Fix the currentUrl used by the thingy for making URLs with action, like pagination and sorting, in the search screen. Fixes bug #12055.
|
2011-03-02 16:40:44 -08:00 |
|
Colin Kuskie
|
79ab978e49
|
Fix the URL to the user after exporting a Thing in CSV format. The URL needs to contain the thingId to see non-default things. Fixes bug #12063
|
2011-02-28 20:33:29 -08:00 |
|
Colin Kuskie
|
7091cedc0a
|
Add the column headers back to the CSV file exported from a Thing. Fixes bug #12062.
|
2011-02-28 19:23:56 -08:00 |
|
Colin Kuskie
|
6749937d4e
|
No direct appending of URL's, since it breaks Prevent Proxy Cache. Also, i18n the buttons. Fixes bug #12051.
|
2011-02-28 09:31:56 -08: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
|
f1dd08c135
|
If there are missing, required fields when saving data to a thing, do not write it to the db. Fixes bug #11996.
|
2011-01-10 16:00:21 -08: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 |
|
Colin Kuskie
|
fd8f03a186
|
Change getMimeType and setMimeType to response->content_type.
|
2010-11-21 22:35:26 -08: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 |
|
Colin Kuskie
|
c4553012d1
|
Syntax clean.
|
2010-11-17 16:34:11 -08: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 |
|
Colin Kuskie
|
87326192a3
|
Merge commit '4635b91554' into WebGUI8. Syntax clean up to 7.10.2
|
2010-10-27 15:59:33 -07:00 |
|
Doug Bell
|
f57ce0c9a6
|
rename variables for consistency
|
2010-10-27 13:06:25 -05:00 |
|
Doug Bell
|
199c4e4960
|
change ErrorHandler to Log
|
2010-10-27 12:50:12 -05: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
|
4f95507485
|
If exportMetaData is set to false, do not print out the column lables OR values. Fixes bug #11925.
|
2010-10-25 10:52:27 -07:00 |
|
Colin Kuskie
|
a41ae977fe
|
Fix a potential SQL injection issue with Thingy.
|
2010-10-11 13:12:20 -07:00 |
|
Colin Kuskie
|
3f17369ae8
|
Remove debug code from the Thingy. Fixes bug #11903
|
2010-10-08 14:25:48 -07:00 |
|
Colin Kuskie
|
1f42a0a24e
|
Remove types for setScript calls, add setCss, which is shorthand for setLink with the CSS specific params preset.
|
2010-09-24 08:03:09 -07:00 |
|
Patrick Donelan
|
329c396a3e
|
Adds Thingy template variable to permit Javascript visualisation of search results
|
2010-09-23 16:15:39 -07:00 |
|
Patrick Donelan
|
e63ce7881c
|
Expose Thingy searchResult_json as template variable
|
2010-09-23 16:15:39 -07:00 |
|
Colin Kuskie
|
6c40adee13
|
Fix line ending processing by the Thingy. It will now accept CSV files with any line endings. Fixes bug #11746.
|
2010-09-23 16:02:47 -07:00 |
|
Colin Kuskie
|
969b36231e
|
Instead of logging non-existant thingId messages to Apache, log to webgui.log
|
2010-09-21 20:58:00 -07:00 |
|
Patrick Donelan
|
093f7d67e9
|
Adds Thingy template variable to permit Javascript visualisation of search results
|
2010-09-21 15:04:09 -04:00 |
|
Patrick Donelan
|
980986880f
|
Expose Thingy searchResult_json as template variable
|
2010-09-21 14:31:28 -04:00 |
|
Colin Kuskie
|
f17623624e
|
Fix line ending processing by the Thingy. It will now accept CSV files with any line endings. Fixes bug #11746.
|
2010-09-13 07:52:14 -07:00 |
|
Graham Knop
|
ed04b99872
|
remove WebGUI::Utility
|
2010-09-07 13:18:49 -05:00 |
|
Graham Knop
|
0adbb519f0
|
remove WebGUI::Utility::sortHash
|
2010-09-07 12:44:11 -05:00 |
|
Graham Knop
|
6aa26c2e44
|
remove WebGUI::Utility::isIn
|
2010-09-07 12:33:15 -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 |
|
Colin Kuskie
|
11ac13c349
|
Prune out a method call from db->dbh->quote_identifier.
|
2010-08-14 17:51:25 -07:00 |
|
Doug Bell
|
708b47d73c
|
Merge remote branch 'upstream/WebGUI8' into 8-merge
Conflicts:
docs/gotcha.txt
docs/previousVersion.sql
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
lib/WebGUI/Asset/Wobject/Navigation.pm
lib/WebGUI/AssetLineage.pm
lib/WebGUI/Config.pm
lib/WebGUI/Form/Template.pm
lib/WebGUI/Group.pm
lib/WebGUI/VersionTag.pm
lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
t/AdSpace.t
t/Asset/AssetExportHtml.t
t/Asset/AssetLineage.t
t/Asset/Story.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/InOutBoard.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/Group.t
t/Mail/Send.t
t/Operation/AdSpace.t
t/Session/ErrorHandler.t
t/Session/Scratch.t
t/Session/Url.t
t/Shop/Cart.t
t/Shop/Pay.t
t/Shop/Ship.t
t/Shop/ShipDriver.t
t/Shop/TaxDriver/Generic.t
t/Shop/Vendor.t
t/VersionTag.t
t/lib/WebGUI/Test.pm
|
2010-07-14 18:20:00 -05:00 |
|
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
|
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 |
|
Colin Kuskie
|
90f0a9b006
|
Fix date field type detection during import. Fixes bug #11692.
|
2010-07-05 09:02:48 -07:00 |
|
Colin Kuskie
|
005b9da1ac
|
Move session->env->getIp into session->request->address
|
2010-07-01 13:11:01 -07:00 |
|
Colin Kuskie
|
565cf955d7
|
Merge commit '469c2b72b4' into WebGUI8. All tests passing.
|
2010-07-01 10:13:22 -07:00 |
|
Colin Kuskie
|
5e502fee53
|
Merge commit '17ce3572bf' into WebGUI8. All tests passing.
|
2010-06-30 18:43:27 -07:00 |
|