Fork of WebGUI 7.10, maintained by Oqapi https://git.oqapi.nl/oqapi/webgui
Find a file
Patrick Donelan b0c5c09461 Merge branch 'master' into survey
* 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
2009-02-10 07:57:42 +00:00
docs Merge branch 'master' into survey 2009-02-10 07:57:42 +00:00
etc fixed #9542: Default WebGUI config contains invalid workflow activity 2009-02-03 23:28:25 +00:00
lib Merge branch 'master' into survey 2009-02-10 07:57:42 +00:00
sbin fixed #9623: preload.custom paths not included during upgrade 2009-02-03 23:46:41 +00:00
t Merge branch 'master' into survey 2009-02-10 07:57:42 +00:00
www Merge branch 'master' into survey 2009-02-10 07:57:42 +00:00
root_import_survey.wgpkg Updated & cleaned YUI includes in Default Survey Edit template 2009-02-03 08:30:48 +00:00