Changeset [ee78f15d61b85e76a76b98731c4ae759dd97f028] by Fred Dirkse - OIC Group, Inc
Revision ee78f15d61b85e76a76b98731c4ae759dd97f028,
committed by Fred Dirkse - OIC Group, Inc
· July 21st, 2011 @ 08:34 PM
Merge branch 'develop' of
ssh://github.com/exponentcms/exponent-cms into develop
https://github.com/exponentcms/exponent-cms/commit/ee78f15d61b85e76...
69 changed files
-
A
datafeed.xml -
A
exponent_constants2.php -
A
exponent_php_setup.php -
A
framework/datatypes/model_alias.php -
A
framework/modules/ecommerce/views/store/edit_model_alias.tpl -
A
framework/modules/ecommerce/views/store/processModelAliases.tpl -
A
framework/modules/ecommerce/views/store/uploadModelAliases.tpl -
R
captcha.php -
R
captcha_why.php -
R
exponent_setup.php -
R
exponent_variables.php -
R
datatypes/definitions/calendar.info.php -
M
ABOUT -
M
CHANGELOG -
M
INSTALLATION -
M
RELEASE -
M
TODO -
M
conf/extensions/minify.defaults.php -
M
conf/extensions/minify.structure.php -
M
conf/extensions/site.defaults.php -
M
cron/generateXMLFeed.php -
M
datatypes/file.php -
M
exponent.js.php -
M
exponent.php -
M
exponent_bootstrap.php -
M
exponent_constants.php -
M
external/Swift-4.0.5/test-suite/lib/simpletest/http.php -
M
external/Swift-4.0.5/test-suite/lib/simpletest/url.php -
M
external/Swift-4.0.5/test-suite/lib/simpletest/web_tester.php -
M
external/minify/min/config.php -
M
external/ups-php/classes/class.ups.php -
M
framework/core/controllers/expSimpleNoteController.php -
M
framework/core/database/definitions/help.php -
M
framework/core/database/definitions/product.php -
M
framework/core/datatypes/expRecord.php -
M
framework/core/subsystems/expRouter.php -
M
framework/core/subsystems/expUtil.php -
M
framework/core/subsystems/expValidator.php -
M
framework/datatypes/keywords.php -
M
framework/modules/administration/controllers/administrationController.php -
M
framework/modules/administration/views/administration/configure_site.tpl -
M
framework/modules/ecommerce/assets/css/storefront.css -
M
framework/modules/ecommerce/billingcalculators/authorizedotnet.php -
M
framework/modules/ecommerce/controllers/storeController.php -
M
framework/modules/ecommerce/products/datatypes/product.php -
M
framework/modules/ecommerce/products/views/product/edit.tpl -
M
framework/modules/ecommerce/views/ecomconfig/configure.tpl -
M
framework/modules/ecommerce/views/store/manage.tpl -
M
framework/modules/ecommerce/views/store/show.tpl -
M
framework/modules/migration/controllers/migrationController.php -
M
framework/modules/users/extensions/user_avatar.php -
M
index.php -
M
install/include/sanity.php -
M
install/upgrades/convert_db_trim.php -
M
install/upgrades/remove_exp1_faqmodule.php -
M
install/upgrades/remove_headlinecontroller.php -
M
modules/administrationmodule/actions/configuresite.php -
M
orphan_source_selector.php -
M
plugins/function.control.php -
M
subsystems/config.php -
M
subsystems/database/mysqli.php -
M
subsystems/database/postgres.php -
M
subsystems/files.php -
M
subsystems/lang/eng_US/conf/extensions/minify.structure.php -
M
subsystems/permissions.php -
M
subsystems/sharedcore.php -
M
subsystems/smtp.php -
M
themes/basetheme/preview.jpg -
M
thumb.php