* 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
* 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
* commit 'tags/WebGUI_7.6.8-beta': (96 commits)
Release 7.6.8-beta
preparing for 7.6.8 release
convert to new storage format
fixing photo comment test
fixed: Syndicated Content corrupts wide characters
Add the WikiPage to the list of contributions shown in the Account Contributions tab.
added #!/usr/bin/env perl to all utility scripts
Forward port i18n fix for Gallery Album RSS list.
Fix some Survey i18n typos in the time limit hoverhelp.
Large batch of Help and i18n. Also, make sure that the
Fix a typo in the i18n help for the ITransact Pay Driver.
Correct dataform captcha variable name in the help.
Forward porting expanded patch for handling deleted things.
Have Thingy check for existance of table and column to prevent
Fix linking to other things and autocreating the form field for it.
Update test to match fixed code.
Remove the warnings pragma
Only resize photos if they are larger than the Gallery resolutions.
Fix a syntax error made in the i18n of the search button.
I18n'ed a submit button in the manage transactions screen.
...
Conflicts:
lib/WebGUI/Asset/Wobject/Survey.pm
lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
www/extras/wobject/Survey/editsurvey.js
www/extras/wobject/Survey/editsurvey/object.js
