merged with HEAD and other interesting changes

2009-03-19 04:12:03 +00:00 · 2009-03-19 04:12:03 +00:00 · 856cc06d04
commit 856cc06d04
parent 66c6c0fae5
151 changed files with 7335 additions and 2602 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' },