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 |
|
Scott Walters
|
dd6a297c06
|
make the admin view [Edit] controls right-click-able so I can continue to right-click-open-in-new-tab them.
|
2011-05-10 14:40:06 -04:00 |
|
Doug Bell
|
daaf45b806
|
remove accordion JS
|
2011-05-03 17:47:53 -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
|
c7825d4f74
|
only drag handles should drag asset
this prevents problems with not being able to input or interact with
assets while the drag handles are showing
|
2011-04-22 18:05:56 -05: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
|
cd15d36ce4
|
edit button in toolbar now works properly
|
2011-04-20 18:37:49 -05:00 |
|
Doug Bell
|
9939e91eda
|
remove useless scope setting
getHelperHandler already provides a function bound to the
correct scope
|
2011-04-20 18:34:03 -05:00 |
|
Doug Bell
|
a7f60c7d45
|
add confirm dialog for helpers
|
2011-04-20 18:29:33 -05:00 |
|
Doug Bell
|
db9753eb01
|
default www_edit now returns template. add errors to edit template
|
2011-04-20 17:49:49 -05:00 |
|
Doug Bell
|
ecce246e1c
|
new layout drag handles working
|
2011-04-20 15:52:50 -05:00 |
|
Doug Bell
|
0299d7837c
|
start on new layout draggables
|
2011-04-19 18:13:03 -05:00 |
|
Doug Bell
|
8906c3f28a
|
className is the full class name. type is the i18n name
|
2011-04-19 14:01:25 -05:00 |
|
Doug Bell
|
5612871d85
|
new, fully-javascript admin toolbars
|
2011-04-18 16:46:30 -05:00 |
|
Doug Bell
|
f5ebb6e916
|
change admin console to get asset info via ajax call after frame is loaded
this is step one in making the asset control toolbars work
correctly without having an "Admin Mode"
|
2011-04-14 15:08:35 -05:00 |
|
Doug Bell
|
ad3231af73
|
change asset www_add and www_edit into templates
|
2011-04-13 16:52:07 -05:00 |
|
Colin Kuskie
|
38de00f931
|
Upgrade TinyMCE to 3.4.2, fixes bugs 11955, 11992
|
2011-04-11 15:05:42 -07:00 |
|
Colin Kuskie
|
faddfc5d8a
|
Cleanup loose file leftover from the TimeField form plugin rewrite.
|
2011-04-11 13:15:56 -07:00 |
|
Chris Hanson
|
bc00c4b6e0
|
fixed #12056: Adding a Thing always creates a table
|
2011-04-07 14:07:58 -05:00 |
|
Doug Bell
|
dbc12d46ac
|
add data to finish() call to allow for actions
|
2011-04-05 18:36:36 -05:00 |
|
Colin Kuskie
|
e3ec56c3c1
|
Allow users to enter in mixed text and macros in URLs inside TinyMCE. Fixes bug #12094.
|
2011-04-05 13:14:18 -07:00 |
|
Colin Kuskie
|
606c1d2e47
|
Ready for 7.10.13 release.
|
2011-04-04 20:29:35 -07:00 |
|
Colin Kuskie
|
a7b1c5778d
|
Revert "Fix for UTF8 URLs in static JS files. Next, all templated/snippet based JS has to be reviewed. Partial fix for bug#12065"
This reverts commit 25fe87db19.
|
2011-03-30 11:28:45 -07:00 |
|
Doug Bell
|
380b9c7540
|
show fork dialog when a helper forks
|
2011-03-29 23:24:58 -05:00 |
|
Colin Kuskie
|
25fe87db19
|
Fix for UTF8 URLs in static JS files. Next, all templated/snippet based JS has to be reviewed. Partial fix for bug#12065
|
2011-03-28 12:39:31 -07:00 |
|
Doug Bell
|
f7fb7cea6b
|
try to make Tree view prettier
|
2011-03-25 15:15:23 -05:00 |
|
Chris Hanson
|
73ff2b839d
|
Corrected minor javascript bug in template preview: "k is not a function"
|
2011-03-22 18:08:57 -05:00 |
|
Doug Bell
|
5f090fe69c
|
fix 12077 Carousel update not possible
We have to make sure the TinyMCE updates the underlying
textarea before we grab the text from it
|
2011-03-21 19:26:36 -05:00 |
|
Colin Kuskie
|
d927f279cb
|
Code cleanup for groupManager JS
|
2011-03-14 16:29:34 -07:00 |
|
Colin Kuskie
|
038001fb41
|
Remove dead code that used to be for the CodeArea.
|
2011-03-14 15:37:14 -07: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 |
|
Doug Bell
|
b27bc19e4d
|
Tree view buttons now work. Changed progress bar helpers to use fork. Added forkId option to AssetHelpers. Added updateAsset service to Admin.
|
2011-03-03 19:25:20 -06:00 |
|
root
|
d72d36986b
|
Removed the ugly time setting pop-up and replaced it with clean JS. Fixes bug #12061
|
2011-03-03 15:50:58 -06:00 |
|
Doug Bell
|
f6831953bd
|
start on Tree buttons to call Asset Helpers
|
2011-02-25 16:08:06 -06:00 |
|
Doug Bell
|
b9e879b7aa
|
change AssetHelpers to have short IDs instead of class names
This will make better code reuse: The Asset Manager will instead
call the AssetHelper with the id of "cut" or "copy" to get the
correct operation.
|
2011-02-25 15:45:42 -06:00 |
|
Colin Kuskie
|
cf72a9fc94
|
Preparing for 7.10.9 release.
|
2011-02-07 20:45:01 -08:00 |
|
Doug Bell
|
8ca685e089
|
add file input for progressive enhancement and testing
|
2011-01-31 20:38:00 -06:00 |
|
Colin Kuskie
|
889b2bc2fd
|
Refix the Friend Manager pagination. Fixes bug #11965
|
2011-01-17 11:59:54 -08:00 |
|
Doug Bell
|
8ba07e0454
|
fix admin view tab height problem in FF
|
2011-01-13 15:27:33 -06:00 |
|
Paul Driver
|
28f4b1b4d2
|
rfe #10521: Use monospaced font in template edit textarea
|
2011-01-10 12:31:15 -06:00 |
|
Paul Driver
|
b3a1e6cfa3
|
IE fixes for preview, modal dialog instead of popup window
|
2011-01-05 16:32:33 -06:00 |
|
Paul Driver
|
cdda6235d7
|
jslinting the preview js
|
2011-01-05 12:47:38 -06:00 |
|
Paul Driver
|
9f9cac02fe
|
whoops, forgot the js
|
2011-01-05 12:43:41 -06:00 |
|
Colin Kuskie
|
b49c500701
|
Bad copy/paste on ajax error message.
|
2010-12-13 09:03:32 -08:00 |
|
Doug Bell
|
0a32122643
|
Merge branch 'carousel'
Conflicts:
lib/WebGUI/Asset/RichEdit.pm
|
2010-12-07 17:23:10 -06:00 |
|
Paul Driver
|
b219324fc1
|
fixed #11978: Pasting links into TinyMCE
|
2010-11-29 15:54:07 -05:00 |
|
Colin Kuskie
|
19b901f2ad
|
Preparing for 7.10.5 release
|
2010-11-16 20:27:56 -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 |
|
Paul Driver
|
7219e21f86
|
Merge branch 'fork'
|
2010-11-01 08:20:38 -05:00 |
|