Changeset [e7aeaa4cc08ffbf8341d8b0611254b3526415cc8] by dleffler
May 15th, 2013 @ 03:25 AM
Merge branch 'develop' into feature/v2.2.1
Conflicts:
external/jquery/addons/css/jquery.countdown.css
framework/modules/countdown/views/countdown/configure/countdown.tpl
framework/modules/countdown/views/countdown/show.tpl
https://github.com/exponentcms/exponent-cms/commit/e7aeaa4cc08ffbf8...
Committed by dleffler
- A framework/modules/ecommerce/views/donation/show.tpl
- A install/upgrades/update_countdown.php
- M CHANGELOG.md
- M external/jquery/addons/css/jquery.countdown.css
- M framework/core/forms/controls/tagtreecontrol.php
- M framework/core/lang/Cestina.php
- M framework/core/lang/Dansk.php
- M framework/core/lang/Deutsch.php
- M framework/core/lang/English - US.php
- M framework/core/lang/Espanol.php
- M framework/core/lang/Francais.php
- M framework/core/lang/Norsk.php
- M framework/core/lang/Suomi.php
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/countdown/views/countdown/configure/countdown.tpl
- M framework/modules/countdown/views/countdown/show.tpl
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/products/models/giftcard.php
- M framework/modules/ecommerce/products/models/product.php
- M framework/modules/ecommerce/products/views/eventregistration/storeListing.tpl
- M framework/modules/ecommerce/products/views/giftcard/storeListing.tpl
- M framework/modules/ecommerce/products/views/product/storeListing.tpl
- M framework/modules/ecommerce/views/cart/checkout.tpl
- M framework/modules/ecommerce/views/eventregistration/show.tpl
- M framework/modules/ecommerce/views/eventregistration/showall.tpl
- M framework/modules/ecommerce/views/shipping/renderOptions2.tpl
- M framework/modules/ecommerce/views/store/configure/image_display.tpl
- M framework/modules/ecommerce/views/store/show.tpl
- M framework/modules/ecommerce/views/store/showFullTree_images.tpl
- M framework/modules/ecommerce/views/store/showall.tpl
- M framework/modules/ecommerce/views/store/showallCategoryFeaturedProducts.tpl
- M framework/modules/ecommerce/views/store/showallFeaturedProducts.tpl
- M framework/modules/ecommerce/views/storeCategory/configure/general.tpl
- M framework/modules/ecommerce/views/storeCategory/configure/image_display.tpl
- M framework/plugins/function.img.php
- M framework/plugins/function.prod_images.php
- M install/changes/2.2.0.txt
- M install/pages/install-3.php
- M install/upgrades/remove_oldfiles.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