webgui/lib/WebGUI/Asset
Patrick Donelan 7ec5cab126 Merge branch 'master' into survey
* 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
2009-03-11 15:26:07 +11:00
..
File updating copyright year 2009-02-20 23:47:30 +00:00
Post updating copyright year 2009-02-20 23:47:30 +00:00
Sku updating copyright year 2009-02-20 23:47:30 +00:00
Template updating copyright year 2009-02-20 23:47:30 +00:00
Wobject Merge branch 'master' into survey 2009-03-11 15:26:07 +11:00
_NewAsset.skeleton Fix POD/whitespace issues. 2009-03-02 17:48:06 +00:00
Event.pm updating copyright year 2009-02-20 23:47:30 +00:00
File.pm updating copyright year 2009-02-20 23:47:30 +00:00
FilePile.pm updating copyright year 2009-02-20 23:47:30 +00:00
MatrixListing.pm changed screenshots in Matrix Listing view to popup 2009-03-09 10:48:26 +00:00
Post.pm updating copyright year 2009-02-20 23:47:30 +00:00
Redirect.pm updating copyright year 2009-02-20 23:47:30 +00:00
RichEdit.pm updating copyright year 2009-02-20 23:47:30 +00:00
RSSCapable.pm updating copyright year 2009-02-20 23:47:30 +00:00
RSSFromParent.pm updating copyright year 2009-02-20 23:47:30 +00:00
Shortcut.pm updating copyright year 2009-02-20 23:47:30 +00:00
Sku.pm updating copyright year 2009-02-20 23:47:30 +00:00
Snippet.pm updating copyright year 2009-02-20 23:47:30 +00:00
Template.pm fixed: Template parser cannot be set 2009-03-04 22:09:08 +00:00
WikiPage.pm updating copyright year 2009-02-20 23:47:30 +00:00
Wobject.pm updating copyright year 2009-02-20 23:47:30 +00:00