Changeset [ef8921c38ce6ed96d582a88ff01474fb9ece201b] by Fred Dirkse - OIC Group, Inc

August 26th, 2011 @ 10:38 PM

Merge branch 'develop' of ssh://github.com/exponentcms/exponent-cms into develop
https://github.com/exponentcms/exponent-cms/commit/ef8921c38ce6ed96...

Committed by Fred Dirkse - OIC Group, Inc

  • A external/Smarty-2/COPYING.lib
  • A framework/core/definitions/shopping_product_types.php
  • A framework/core/definitions/shopping_product_types_storeCategories.php
  • A framework/core/models/shopping_product_types.php
  • A framework/modules-1/exporter/exporters/files/info.php
  • A framework/modules-1/importer/importers/files/info.php
  • A framework/modules-1/importer/importers/usercsv/tmp/.htaccess
  • A framework/modules/ecommerce/assets/sql/exponent_shopping_product_types.sql
  • A framework/modules/ecommerce/assets/sql/exponent_shopzilla_product_types.sql
  • A themes/basetheme/sample.eql
  • A themes/basetheme/sample.tar.gz
  • A themes/coolwatertheme/sample.eql
  • A themes/coolwatertheme/sample.tar.gz
  • A themes/retrotheme/sample.tar.gz
  • A tmp/extensionuploads/.htaccess
  • R framework/modules-1/exporter/exporters/files/info-disabled.php
  • R framework/modules-1/importer/importers/files/info-disabled.php
  • R framework/modules-1/importer/importers/usercsv/tmp/.placeholder
  • M .gitignore
  • M conf/config.php.example
  • M conf/extensions/display.defaults.php
  • M conf/extensions/display.structure.php
  • M conf/extensions/sef.defaults.php
  • M conf/extensions/site.defaults.php
  • M conf/extensions/site.structure.php
  • M cron/send_reminders.php
  • M exponent.php
  • M exponent_bootstrap.php
  • M framework/core/definitions/product.php
  • M framework/core/models-1/calendar.php
  • M framework/core/models-1/section.php
  • M framework/core/models-1/section_template.php
  • M framework/core/models/storeCategoryFeeds.php
  • M framework/core/subsystems-1/backup/normalize.php
  • M framework/core/subsystems-1/database/mysql.php
  • M framework/core/subsystems-1/database/mysqli.php
  • M framework/core/subsystems-1/database/mysqlid.php
  • M framework/core/subsystems-1/database/postgres.php
  • M framework/core/subsystems-1/forms.php
  • M framework/core/subsystems-1/forms/controls/autocompletecontrol.php
  • M framework/core/subsystems-1/forms/controls/calendarcontrol.php
  • M framework/core/subsystems-1/forms/controls/configcontrol.php
  • M framework/core/subsystems-1/forms/controls/countryregioncontrol.php
  • M framework/core/subsystems-1/forms/controls/filemanagercontrol.php
  • M framework/core/subsystems-1/forms/controls/listcontrol.php
  • M framework/core/subsystems-1/forms/controls/quantitycontrol.php
  • M framework/core/subsystems-1/forms/controls/tagtreecontrol.php
  • M framework/core/subsystems-1/forms/controls/yuicalendarcontrol.php
  • M framework/core/subsystems-1/forms/controls/yuidatetimecontrol.php
  • M framework/core/subsystems-1/forms/controls/yuieditorcontrol.php
  • M framework/core/subsystems-1/geo.php
  • M framework/core/subsystems-1/modules.php
  • M framework/core/subsystems-1/template.php
  • M framework/core/subsystems-1/users.php
  • M framework/core/subsystems/expJavascript.php
  • M framework/core/subsystems/expPaginator.php
  • M framework/core/subsystems/expTheme.php
  • M framework/modules-1/administrationmodule/actions/config_activate.php
  • M framework/modules-1/administrationmodule/actions/config_configuresite.php
  • M framework/modules-1/administrationmodule/actions/config_delete.php
  • M framework/modules-1/administrationmodule/actions/config_save.php
  • M framework/modules-1/administrationmodule/actions/configuresite.php
  • M framework/modules-1/administrationmodule/actions/managesubsystems.php
  • M framework/modules-1/administrationmodule/actions/profileext_manage.php
  • M framework/modules-1/administrationmodule/actions/switchtheme.php
  • M framework/modules-1/administrationmodule/actions/sysinfo.php
  • M framework/modules-1/administrationmodule/actions/sysinfo_download.php
  • M framework/modules-1/administrationmodule/actions/toggle_dev.php
  • M framework/modules-1/administrationmodule/actions/toggle_maintenance.php
  • M framework/modules-1/calendarmodule/actions/delete_form.php
  • M framework/modules-1/calendarmodule/actions/edit.php
  • M framework/modules-1/calendarmodule/actions/save.php
  • M framework/modules-1/calendarmodule/class.php
  • M framework/modules-1/containermodule/actions/edit.php
  • M framework/modules-1/containermodule/class.php
  • M framework/modules-1/exporter/exporters/eql/savefile.php
  • M framework/modules-1/exporter/exporters/files/export.php
  • M framework/modules-1/exporter/exporters/files/start.php
  • M framework/modules-1/exporter/views/_exporters.tpl
  • M framework/modules-1/exporter/views/_files_modList.tpl
  • M framework/modules-1/formbuilder/actions/edit_record.php
  • M framework/modules-1/formbuilder/actions/export_csv.php
  • M framework/modules-1/formbuilder/actions/picked_source.php
  • M framework/modules-1/formbuilder/actions/submit_form.php
  • M framework/modules-1/formbuilder/actions/view_data.php
  • M framework/modules-1/formbuilder/actions/view_form.php
  • M framework/modules-1/formbuilder/actions/view_record.php
  • M framework/modules-1/formmodule/class.php
  • M framework/modules-1/importer/importers/files/extract.php
  • M framework/modules-1/importer/importers/files/finish.php
  • M framework/modules-1/importer/importers/files/process.php
  • M framework/modules-1/importer/views/_eql_restoreForm.tpl
  • M framework/modules-1/importer/views/_files_final.tpl
  • M framework/modules-1/importer/views/_files_selectModList.tpl
  • M framework/modules-1/importer/views/_files_uploadForm.tpl
  • M framework/modules-1/importer/views/_files_verifyFiles.tpl
  • M framework/modules-1/importer/views/_importers.tpl
  • M framework/modules-1/navigationmodule/actions/returnChildrenAsJSON.php
  • M framework/modules-1/navigationmodule/class.php
  • M framework/modules-1/navigationmodule/views/_manager_standalone.tpl
  • M framework/modules-1/simplepollmodule/actions/manage_question.php
  • M framework/modules-1/simplepollmodule/actions/results.php
  • M framework/modules-1/simplepollmodule/class.php
  • M framework/modules/administration/controllers/administrationController.php
  • M framework/modules/administration/menus/admin.php
  • M framework/modules/administration/menus/files.php
  • M framework/modules/administration/views/administration/configure_site.tpl
  • M framework/modules/common/views/options/dropdown.tpl
  • M framework/modules/ecommerce/assets/js/expand_panels.js
  • M framework/modules/ecommerce/assets/js/swatches.js
  • M framework/modules/ecommerce/controllers/storeCategoryController.php
  • M framework/modules/ecommerce/controllers/storeController.php
  • M framework/modules/ecommerce/products/views/product/addToOrder.tpl
  • M framework/modules/ecommerce/products/views/product/child_edit.tpl
  • M framework/modules/ecommerce/products/views/product/edit.tpl
  • M framework/modules/ecommerce/views/billing/authorizedotnet.tpl
  • M framework/modules/ecommerce/views/billing/passthru.tpl
  • M framework/modules/ecommerce/views/billing/splitcreditcard.tpl
  • M framework/modules/ecommerce/views/order/createReferenceOrder.tpl
  • M framework/modules/ecommerce/views/store/showTopLevel_images.tpl
  • M framework/modules/ecommerce/views/store/showall.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/manage_files.tpl
  • M framework/modules/migration/views/migration/manage_pages.tpl
  • M framework/modules/migration/views/migration/manage_users.tpl
  • M framework/modules/migration/views/migration/migrate_files.tpl
  • M framework/modules/photoalbum/views/photos/slideshow.tpl
  • M framework/modules/portfolio/views/portfolio/slideshow.tpl
  • M framework/modules/users/models/user.php
  • M framework/plugins/block.paginate.php
  • M framework/plugins/block.pop.php
  • M framework/plugins/block.script.php
  • M framework/plugins/function.ddrerank.php
  • M framework/plugins/function.object_to_js.php
  • M framework/plugins/function.prod_images.php
  • M framework/plugins/function.yuilogger.php
  • M framework/plugins/function.yuimenu.php
  • M framework/plugins/function.yuimenubar.php
  • M install/index.php
  • M install/pages/install-2.php
  • M install/pages/install-4.php
  • M install/pages/upgrade-2.php
  • M install/upgrades/clear_cache.php
  • M themes/basetheme/index.php
  • M themes/coolwatertheme/index.php
  • M themes/coolwatertheme/subthemes/Full Body.php
  • M thumb.php
New-ticket 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

Shared Ticket Bins