* survey-rfe
Turned off package flag on expireincompletesurveyresponses
Merged Survey Templates
Cleaned up Survey i18n
Added Params::Validate to gotcha.txt
Added Survey upgrade script for doAfterTimeLimit and RemoveResponseTemplate
Updated SurveyJSON tests to recognise goto[Expression] on Section and Question
Merge branch 'master' into survey
removing traces
Added goto to sections and questions. Order of precedence is answer, question, then section.
removing surveybundle
removing trace
Survey.pm now has surveyJSON as a normal definition property, which is also versioned. Survey Responses are not versioned, so updating a survey can cause errors with ongoing responses.
Drag and drop functionality vastly improved in usability.
Time multiplier was set wrong
fixed typo in template
Added workflow (and email template to WebGUI/) to delete expired surveys and notify users via email.
Removed hard-coding of multi-choice bundles from administersurvey.js
Fixed regression in ResponseJSON's sectionId, questionId and answerId methods
Started working on Survey Multiple Choice bundle management.
Fixed template var regression in Survey.pm
Survey documentation improvements
...
* master: (121 commits)
Fix a POD typo.
correct inbox message from user preface
Fix a typo in the Default gallery view template
Documentation bug in buildArrayRefOfHashRefs
changed screenshots in Matrix Listing view to popup
matrix privileging fixes
Fix an i18n typo in the Post user defined variables.
Remove debugging code.
approval workflow fix
matrix upgrade and privileging fixes
fixed: Template parser cannot be set
forward porting gallery bug fixes
preparing for 7.7.0 dev
parser should be a selectbox, not a selectlist.
labeling survey as beta
fixeding my borkes to the changelog
fixed#9852: Users can accept private messages from Visitor, but Visitor cannot send messages
preparing for 7.6.14 release
fix AdSpace, Ad tests
Restore the original properties for the profile category that was modified for test.
...
Conflicts:
docs/gotcha.txt
docs/upgrades/upgrade_7.6.10-7.6.11.pl
lib/WebGUI/Asset/Wobject/Survey.pm
lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
* 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
