Changeset [b777d271e1f166fbdc82523192f715cc5df7b9aa] by Phillip Ball

Revision b777d271e1f166fbdc82523192f715cc5df7b9aa, committed by Phillip Ball · June 29th, 2011 @ 05:58 PM

Merge remote branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/b777d271e1f166fb...

50 changed files

A framework/modules/container/assets/images/trashcan_full.png
A framework/modules/container/assets/images/trashcan_full_grey.png
A framework/modules/pixidou/assets/css/pixidou.css
A framework/modules/pixidou/assets/images/background.gif
A framework/modules/pixidou/assets/images/bg-h.gif
A framework/modules/pixidou/assets/images/hue_thumb.png
A framework/modules/pixidou/assets/images/picker_thumb.png
A framework/modules/pixidou/assets/images/thumb-n.gif
A framework/modules/recyclebin/assets/css/recyclebin.css
A framework/modules/recyclebin/assets/images/trashcan_full_large.png
A framework/modules/recyclebin/assets/images/use-recycled.png
A framework/modules/recyclebin/assets/images/usingrb-check.png
A framework/modules/recyclebin/assets/images/usingrb-uncheck.png
A modules/calendarmodule/forms/email/Contact Form.tpl
A modules/calendarmodule/forms/email/RSVP Form.tpl
A modules/calendarmodule/forms/email/_Contact Form.tpl
A modules/calendarmodule/forms/email/_RSVP Form.tpl
A subsystems/lang/eng_US/modules/calendarmodule/forms/email/Contact Form.php
R framework/modules/pixidou/css/pixidou.css
R framework/modules/pixidou/assets/background.gif
R framework/modules/pixidou/assets/bg-h.gif
R framework/modules/pixidou/assets/hue_thumb.png
R framework/modules/pixidou/assets/picker_thumb.png
R framework/modules/pixidou/assets/thumb-n.gif
R framework/modules/recyclebin/css/recyclebin.css
R framework/modules/recyclebin/images/trashcan_full_large.png
R framework/modules/recyclebin/images/use-recycled.png
R framework/modules/recyclebin/images/usingrb-check.png
R framework/modules/recyclebin/images/usingrb-uncheck.png
R forms/email/Contact Form.tpl
R forms/email/RSVP Form.tpl
R forms/email/_Contact Form.tpl
R forms/email/_RSVP Form.tpl
R subsystems/lang/eng_US/forms/email/Contact Form.php
M framework/modules/administration/controllers/administrationController.php
M framework/modules/container/assets/css/add-content.css
M framework/modules/help/controllers/helpController.php
M framework/modules/help/views/help/edit.tpl
M framework/modules/help/views/help/edit_version.tpl
M framework/modules/help/views/help/manage.tpl
M framework/modules/help/views/help/manage_versions.tpl
M framework/modules/help/views/help/show.tpl
M framework/modules/help/views/help/showall.tpl
M framework/modules/pixidou/index.php
M framework/modules/pixidou/js/ui.js
M framework/modules/pixidou/views/pixidou/editor.tpl
M modules/formbuilder/actions/export_csv.php
M modules/formbuilder/actions/submit_form.php
M plugins/function.prod_images.php
M subsystems/core.php