oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into survey

Browse source 
* master: (127 commits)
  Prefill in the email address in the ITransact credentials form from the user's Shop address.
  fixed Matrix best/worst rated lists
  Fix bad form variable for phone number in EMS Badge address info.
  - Added a switch to allow the use of non-WebGUI objects with the Workflow
  fixing a problem with previous survey fix
  fixed #9671: Survey - breaks admin bar
  fixed a Matrix sql problem
  i18n the image labels and title for the asset manager, manage screen.
  Prevent an imported package from changing the a current asset's status from pending to anything else.
  Remove trailing comma in Shop/Transaction JS so IE6 works.
  fixed documentation
  fixed a bug when a matrix listing didn't have a forum attached
  small char encoding fix to merged upgrade
  fix small issue in addChild
  adding merge point
  Fix a problem with purging an EMS.
  Update this template so that it passes the template i18n test.
  Fix a broken i18n label in answer edit template for the Survey.
  Unify all Survey CSS into 1 file, and use it.
  Adding/fixing Survey i18n and Help
  ...

Conflicts:
	lib/WebGUI/Asset/Wobject/Survey.pm
	lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
	lib/WebGUI/i18n/English/Asset_Survey.pm
	www/extras/wobject/Survey/editsurvey/object.js
This commit is contained in:
Patrick Donelan 2009-02-10 07:57:42 +00:00
commit b0c5c09461
127 changed files with 5481 additions and 677 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/WebGUI/i18n/English/Account_Inbox.pm
View file

@ -49,6 +49,16 @@ our $I18N = {
lastUpdated => 1119068809
},
'inbox send message template label' => {
message => q|Send Message Template|,
lastUpdated => 1119068809,
},
'inbox send message template hoverHelp' => {
message => q|Choose the template for sending a message|,
lastUpdated => 1119068809,
},
'inbox message confirm template label' => {
message => q|Inbox Message Confirm Template|,
lastUpdated => 1119068809
@ -525,6 +535,17 @@ our $I18N = {
lastUpdated => 1230867391,
},
'inbox rich editor label' => {
message => q{Inbox Rich Editor},
lastUpdated => 0,
context => q{Label for setting},
},
'inbox rich editor description' => {
message => q{The rich editor used to compose messages},
lastUpdated => 0,
context => "Description of Inbox setting",
},
};
1;

12
lib/WebGUI/i18n/English/Asset.pm
View file

@ -1178,6 +1178,18 @@ Couldn't open %-s because %-s <br />
context => q{Error message in exportAsHtml for an illegal parameter.},
},
'unlocked' => {
message => q{unlocked},
lastUpdated => 0,
context => q{Asset Manager label, when an asset is unlocked.},
},
'locked by' => {
message => q{locked by},
lastUpdated => 0,
context => q{Asset Manager label, as in "locked by admin"},
},
};
1;

5
lib/WebGUI/i18n/English/Asset_Matrix.pm
View file

@ -755,6 +755,11 @@ selectBox.</p>|
message => q|Matrix Asset Template Variables|,
},
'matrix fieldtype' => {
lastUpdated => 0,
message => q|Matrix Fieldtype|,
},
};
1;

941
lib/WebGUI/i18n/English/Asset_Survey.pm
View file

File diff suppressed because it is too large Load diff

3
lib/WebGUI/i18n/English/Form_MatrixCompare.pm
View file

@ -2,9 +2,10 @@ package WebGUI::i18n::English::Form_MatrixCompare;
use strict;
our $I18N = {
'topicName' => {
'matrix compare' => {
message => q|Matrix Compare|,
lastUpdated => 0,
context => q|Name of this form control. With regard to a set of features, this control lets you choose if the listing has the feature, does not have the feature, if it is free, or for pay. Matrix Feature Comparison List.|,
},
'no' => {