Changeset [31684cea1055eb07498bdc086ca0d2879dd93e4c] by Phillip Ball
Revision 31684cea1055eb07498bdc086ca0d2879dd93e4c,
committed by Phillip Ball
· March 10th, 2011 @ 07:50 PM
Merge branch 'master' of https://github.com/dleffler/exponent-cms
into dleffler-master
https://github.com/exponentcms/exponent-cms/commit/31684cea1055eb07...
18 changed files
-
M
conf/data/date_format.dropdown -
M
conf/data/datetime_format.dropdown -
M
conf/data/start_of_week.dropdown -
M
datatypes/calendarmodule_config.php -
M
datatypes/section.php -
M
framework/modules/administration/controllers/administrationController.php -
M
framework/modules/administration/menus/admin.php -
M
framework/modules/administration/menus/ecomm.php -
M
framework/modules/administration/views/administration/configure_site.tpl -
M
framework/modules/ecommerce/views/ecomconfig/configure.tpl -
M
framework/modules/ecommerce/views/order_status/manage.tpl -
M
framework/modules/ecommerce/views/order_type/manage.tpl -
M
framework/modules/ecommerce/views/store/picktype.tpl -
M
framework/modules/ecommerce/views/store/showallUncategorized.tpl -
M
framework/modules/ecommerce/views/storeCategory/manage.tpl -
M
modules/formbuilder/actions/submit_form.php -
M
subsystems/lang/eng_US/modules/administrationmodule/tasks/coretasks.php -
M
subsystems/lang/eng_US/modules/navigationmodule/views/_manager.php