Changeset [7630ea869c098038a84305829d92b0d7282ea113] by dleffler
March 22nd, 2013 @ 01:22 AM
Merge branch 'develop' into feature/container2
Conflicts:
framework/modules/ecommerce/controllers/eventregistrationController.php
framework/modules/ecommerce/views/cart/checkout.tpl
framework/modules/ecommerce/views/eventregistration/show.tpl
framework/modules/users/views/users/edituser.tpl
https://github.com/exponentcms/exponent-cms/commit/7630ea869c098038...
Committed by dleffler
- A framework/modules/ecommerce/views/eventregistration/edit_registrant.tpl
- M CHANGELOG.md
- M framework/modules/ecommerce/assets/css/eventregistration.css
- M framework/modules/ecommerce/billingcalculators/cash.php
- M framework/modules/ecommerce/billingcalculators/paypalExpressCheckout.php
- M framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/ecommerce/controllers/eventregistrationController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/definitions/eventregistration.php
- M framework/modules/ecommerce/products/models/eventregistration.php
- M framework/modules/ecommerce/products/views/eventregistration/edit.tpl
- M framework/modules/ecommerce/products/views/eventregistration/formatExtraData.tpl
- M framework/modules/ecommerce/products/views/product/child_edit.tpl
- M framework/modules/ecommerce/views/cart/checkout.tpl
- M framework/modules/ecommerce/views/eventregistration/show.tpl
- M framework/modules/ecommerce/views/eventregistration/view_registrants.tpl
- M framework/modules/ecommerce/views/store/edit_pricing.tpl
- M framework/modules/events/controllers/eventController.php
- M framework/modules/events/views/event/month.tpl
- M framework/modules/importexport/controllers/importexportController.php
- M framework/plugins/block.toggle.php
- M install/changes/2.1.4.txt
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Bug Tracker for Exponent CMS