Changeset [71cfed612e88857e7cfe7d67a352b0e740971f48] by Fred Dirkse - OIC Group, Inc

September 26th, 2011 @ 07:31 PM

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

Committed by Fred Dirkse - OIC Group, Inc

  • A framework/modules/twitter/assets/images/tweeted.png
  • A themes/simpletheme/mobile/index.php
  • M conf/extensions/display.defaults.php
  • M conf/extensions/display.structure.php
  • M exponent.js.php
  • M exponent.php
  • M framework/core/models/expFile.php
  • M framework/core/subsystems-1/forms/controls/tagtreecontrol.php
  • M framework/core/subsystems/expCSS.php
  • M framework/core/subsystems/expSession.php
  • M framework/core/subsystems/expTheme.php
  • M framework/modules-1/navigationmodule/views/YUI Top Nav.tpl
  • M framework/modules-1/navigationmodule/views/_manager.tpl
  • M framework/modules/administration/controllers/administrationController.php
  • M framework/modules/administration/menus/admin.php
  • M framework/modules/administration/views/administration/configure_site.tpl
  • M framework/modules/core/views/expModule/manage.tpl
  • M framework/modules/ecommerce/assets/css/storefront.css
  • M framework/modules/ecommerce/billingcalculators/cash.php
  • M framework/modules/ecommerce/billingcalculators/paypalExpressCheckout.php
  • M framework/modules/ecommerce/billingcalculators/worldpayCheckout.php
  • M framework/modules/ecommerce/controllers/taxController.php
  • M framework/modules/ecommerce/products/views/product/child_edit.tpl
  • M framework/modules/ecommerce/products/views/product/edit.tpl
  • M framework/modules/ecommerce/products/views/product/options_partial.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/fedexcalculator/configure.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/flatratecalculator/configure.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/freeshippingcalculator/configure.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/instorepickupcalculator/configure.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/upscalculator/configure.tpl
  • M framework/modules/ecommerce/views/cart/checkout.tpl
  • M framework/modules/ecommerce/views/cart/quickPay.tpl
  • M framework/modules/ecommerce/views/cart/show.tpl
  • M framework/modules/ecommerce/views/ecomconfig/configure.tpl
  • M framework/modules/ecommerce/views/ecomconfig/edit_discount.tpl
  • M framework/modules/ecommerce/views/order/edit_billing_address.tpl
  • M framework/modules/ecommerce/views/order/edit_payment_info.tpl
  • M framework/modules/ecommerce/views/order/show.tpl
  • M framework/modules/ecommerce/views/purchaseOrder/edit_vendor.tpl
  • M framework/modules/ecommerce/views/store/show.tpl
  • M framework/modules/ecommerce/views/storeCategory/edit.tpl
  • M framework/modules/filedownloads/views/filedownload/edit.tpl
  • M framework/modules/help/views/help/edit.tpl
  • M framework/modules/help/views/help/show.tpl
  • M framework/modules/news/controllers/newsController.php
  • M framework/modules/news/models/SimplePie.php
  • M framework/modules/photoalbum/assets/js/yui3-slideshow.js
  • M framework/modules/photoalbum/views/photos/edit.tpl
  • M framework/modules/portfolio/views/portfolio/edit.tpl
  • M framework/modules/portfolio/views/portfolio/show.tpl
  • M framework/modules/report/controllers/reportController.php
  • M framework/modules/report/views/report/abandoned_carts.tpl
  • M framework/modules/report/views/report/cart_summary.tpl
  • M framework/modules/search/controllers/searchController.php
  • M framework/modules/twitter/controllers/twitterController.php
  • M framework/modules/twitter/views/twitter/configure/twitter.tpl
  • M framework/modules/twitter/views/twitter/showall.tpl
  • M framework/plugins/function.control.php
  • M themes/basetheme/index.php
  • M themes/retrotheme/css/nav.css
  • M themes/retrotheme/index.php
  • M themes/retrotheme/subthemes/Three Column.php
  • M themes/simpletheme/css/1-nav.css
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