Changeset [c19d3f63a5abfc0957dae1b772615e7fcf846216] by Fred Dirkse - OIC Group, Inc
Revision c19d3f63a5abfc0957dae1b772615e7fcf846216,
committed by Fred Dirkse - OIC Group, Inc
· July 14th, 2011 @ 06:40 PM
Merge branch 'develop' of ssh://git@github.com/exponentcms/exponent-cms
into develop
https://github.com/exponentcms/exponent-cms/commit/c19d3f63a5abfc09...
25 changed files
-
M
CHANGELOG -
M
RELEASE -
M
framework/core/expFramework.php -
M
framework/core/subsystems/expQueue.php -
M
framework/modules/core/views/expSimpleNote/getNotes.tpl -
M
framework/modules/ecommerce/assets/css/ecom.css -
M
framework/modules/ecommerce/assets/css/storefront.css -
M
framework/modules/ecommerce/controllers/billingController.php -
M
framework/modules/ecommerce/controllers/cartController.php -
M
framework/modules/ecommerce/controllers/storeController.php -
M
framework/modules/ecommerce/products/datatypes/product.php -
M
framework/modules/ecommerce/views/order/show.tpl -
M
framework/modules/ecommerce/views/store/show.tpl -
M
framework/modules/ecommerce/views/store/showall.tpl -
M
framework/modules/report/controllers/reportController.php -
M
install/index.php -
M
install/pages/install-7.php -
M
install/pages/save_admin.php -
M
install/pages/upgrade-1.php -
M
install/pages/upgrade-2.php -
M
install/upgrades/install_tables.php -
M
modules/calendarmodule/actions/search.php -
M
modules/formbuilder/actions/submit_form.php -
M
phpdoc.ini -
M
subsystems/database/mysqli.php