Changeset [f679c5e10b0ade8251cded7c31395c7709205cda] by dleffler
October 13th, 2011 @ 02:55 AM
Merge branch 'develop' into feature/smarty3
https://github.com/exponentcms/exponent-cms/commit/f679c5e10b0ade82...
Committed by dleffler
- A framework/modules/users/extensions/user_address.php
- A framework/modules/users/extensions/user_phone.php
- A framework/modules/users/views/extensions/user_address.tpl
- A framework/modules/users/views/extensions/user_phone.tpl
- M framework/core/definitions/product.php
- M framework/core/subsystems/forms/controls/ckeditorcontrol.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/products/datatypes/product.php
- M framework/modules/ecommerce/views/store/edit_categories.tpl
- M framework/modules/ecommerce/views/store/edit_extrafields.tpl
- M framework/modules/ecommerce/views/store/edit_general.tpl
- M framework/modules/ecommerce/views/store/edit_options.tpl
- M framework/modules/ecommerce/views/store/edit_userinput.tpl
- M framework/modules/users/controllers/usersController.php
- M framework/modules/users/definitions/user_address.php
- M framework/modules/users/definitions/user_phone.php
- M framework/modules/users/extensions/user_avatar.php
- M framework/modules/users/views/users/edituser.tpl
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