Merge commit WebGUI_7.6.9-beta into survey-rfe
* commit 'tags/WebGUI_7.6.9-beta': (31 commits) Release 7.6.9-beta preparing for 7.6.9 release fixed: Exporting to static files can leak large amounts of memory fixed: HTTP Proxy doesn't serve new content to visitors use to_json and from_json in more places instead of encode_json and decode_json Document the heretofore missing date template variable in Qualify a chained method call when getting Workflow instances. If the Attempt to fix IE6 bug fixed: ukplayer example is now loaded with swfobject.js released under the MIT licence, see gotcha's and /extras/ukplayer Added a style for printing Alumni pages Emails sent about low stock should have status unread, not completed. Moved draggable.js to extras/yui-webgui/build/layout since it is now a wrapper around YUI dragdrob Attributions in the changelog for a patch provided to fix a bug. whups, left in console.logs Updated draggable.js to wrap the YUI fixed #4137: Calendar Search page has extra head tags in body Fix a typo typo in the Operation/Workflow POD. Forward port Shelf view fix. Was not displaying child shelves, only self. Forward port the PayDriver bug fixes from 7.5 branch. Labels are always fixed #9264: new slideShow.swf uploaded in extras/ukplayer (United Knowledge/Arjan Widlak) ... Conflicts: lib/WebGUI/Asset/Wobject/Survey.pm
This commit is contained in:
commit
1376c8ae92
60 changed files with 999 additions and 1199 deletions
|
|
@ -725,8 +725,8 @@ our $I18N = {
|
|||
},
|
||||
|
||||
'imageDensity description' => {
|
||||
message => q{The density of the image. Print-quality images are more than three times the size of web-quality images.},
|
||||
lastUpdated => 0,
|
||||
message => q{The density of the image. Print-quality images are more than three times the resolution of web-quality images.},
|
||||
lastUpdated => 1231764657,
|
||||
context => q{Description of asset property},
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -331,8 +331,8 @@ it would be best to make sure the names are the same.|,
|
|||
},
|
||||
|
||||
'CATEGORY_NAME_loop' => {
|
||||
message => q|A loop containting attributes and values for those attributes is created for each category in this matrix. The name of the loop is the category name with spaces replaced with hyphens and a _loop added to the end. So if you have a category called "Bells and Whistles" then the loop would be called "bells-and-whistles_loop".|,
|
||||
lastUpdated => 0,
|
||||
message => q|A loop containing attributes, and values for those attributes, is created for each category in this matrix. The name of the loop is the category name with spaces replaced with hyphens and a _loop added to the end. So if you have a category called "Bells and Whistles" then the loop would be called "bells-and-whistles_loop".|,
|
||||
lastUpdated => 1231764520,
|
||||
context => q|Description of the CATEGORY_NAME_loop tmpl_var for the template help.|,
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -121,6 +121,11 @@ our $I18N = {
|
|||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'date' => {
|
||||
message => q|The publication date for this item.|,
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
'author' => {
|
||||
message => q|The publisher of this item.|,
|
||||
lastUpdated => 0,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue