Merge in HEAD, up to 9866.

2009-03-17 23:45:21 +00:00 · 2009-03-17 23:45:21 +00:00 · 2bd7a60a01
commit 2bd7a60a01
parent c7a66861a6
107 changed files with 6258 additions and 2436 deletions
--- a/lib/WebGUI/Help/Asset_MatrixListing.pm
+++ b/lib/WebGUI/Help/Asset_MatrixListing.pm
@ -14,6 +14,10 @@ our $HELP = {
            },
        ],
        variables => [
+            { 'name' => 'canEdit' },
+            { 'name' => 'editUrl' },
+            { 'name' => 'canApprove' },
+            { 'name' => 'approveOrDenyUrl' },
            { 'name' => 'screenshots' },
            { 'name' => 'emailForm' },
            { 'name' => 'emailSent' },