Changeset [b698a742a08608bb1251c408cde6480ca9887fca] by Phillip Ball
August 22nd, 2011 @ 07:10 PM
Merge remote branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/b698a742a08608bb...
Committed by Phillip Ball
- A framework/core/definitions/shopzilla_product_types.php
- A framework/core/definitions/shopzilla_product_types_storeCategories.php
- A framework/core/models/shopzilla_product_types.php
- R framework/core/subsystems-1/javascript.php
- R framework/core/subsystems/autoloader.php
- M exponent.php
- M exponent_bootstrap.php
- M exponent_php_setup.php
- M external/feedcreator.class.php
- M framework/core/controllers/expTagController.php
- M framework/core/definitions/product.php
- M framework/core/expFramework.php
- M framework/core/models/expFile.php
- M framework/core/models/expRss.php
- M framework/core/models/shipping.php
- M framework/core/models/storeCategoryFeeds.php
- M framework/core/subsystems-1/backup.php
- M framework/core/subsystems-1/core.php
- M framework/core/subsystems-1/forms/controls/countryregioncontrol.php
- M framework/core/subsystems/expJavascript.php
- M framework/core/subsystems/expLDAP.php
- M framework/core/subsystems/expSettings.php
- M framework/core/subsystems/expTheme.php
- M framework/modules-1/containermodule/actions/edit.php
- M framework/modules-1/importer/importers/usercsv/start.php
- M framework/modules-1/navigationmodule/actions/returnChildrenAsJSON.php
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/ecommerce/assets/sql/exponent_nextag_product_types.sql
- M framework/modules/ecommerce/controllers/storeCategoryController.php
- M framework/modules/ecommerce/products/views/product/edit.tpl
- M framework/modules/ecommerce/views/storeCategory/edit.tpl
- M framework/modules/migration/controllers/migrationController.php
- M framework/modules/migration/views/migration/configure.tpl
- M framework/modules/migration/views/migration/migrate_content.tpl
- M framework/modules/migration/views/migration/migrate_files.tpl
- M framework/plugins/block.paginate.php
- M framework/plugins/block.pop.php
- M framework/plugins/function.object_to_js.php
- M framework/plugins/function.yuilogger.php
- M install/pages/welcome.php
- M rss.php
- M site_rss.php
- M themes/retrotheme/sample.eql
- M thumb.php
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