Changeset [4e53d3215603a5fd17f712d4d929bddba89658d6] by rasseljandavid

November 17th, 2011 @ 12:14 PM

Merge remote-tracking branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/4e53d3215603a5fd...

Committed by rasseljandavid

  • M exponent_constants.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/Norsk.php
  • M framework/core/subsystems/expLang.php
  • M framework/modules-1/containermodule/views/Default.tpl
  • M framework/modules-1/containermodule/views/_form_edit.tpl
  • M framework/modules-1/navigationmodule/views/_manager_hierarchy.tpl
  • M framework/modules/addressbook/views/address/edit.tpl
  • M framework/modules/blog/views/blog/configure/blog.tpl
  • M framework/modules/common/views/configure/files.tpl
  • M framework/modules/common/views/configure/pagination.tpl
  • M framework/modules/common/views/file/configure/Gallery.tpl
  • M framework/modules/common/views/file/configure/Showcase.tpl
  • M framework/modules/core/views/expHTMLEditor/edit.tpl
  • M framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.tpl
  • M framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl
  • M framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl
  • M framework/modules/ecommerce/billingcalculators/views/splitcreditcard/configure.tpl
  • M framework/modules/ecommerce/billingcalculators/views/worldpayCheckout/configure.tpl
  • M framework/modules/ecommerce/products/views/donation/addToCart.tpl
  • M framework/modules/ecommerce/products/views/donation/edit.tpl
  • M framework/modules/ecommerce/products/views/eventregistration/addToCart.tpl
  • M framework/modules/ecommerce/products/views/eventregistration/edit.tpl
  • M framework/modules/ecommerce/products/views/giftcard/addToCart.tpl
  • M framework/modules/ecommerce/products/views/giftcard/edit.tpl
  • 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/tablebasedcalculator/editspeed.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/upscalculator/configure.tpl
  • M framework/modules/ecommerce/views/billing/passthru.tpl
  • M framework/modules/ecommerce/views/cart/address.tpl
  • M framework/modules/ecommerce/views/cart/createaddress.tpl
  • M framework/modules/ecommerce/views/cart/quickPay.tpl
  • M framework/modules/ecommerce/views/cart/selectShippingMethods.tpl
  • M framework/modules/ecommerce/views/ecomconfig/configure.tpl
  • M framework/modules/ecommerce/views/ecomconfig/edit_discount.tpl
  • M framework/modules/ecommerce/views/ecomconfig/edit_option_master.tpl
  • M framework/modules/ecommerce/views/ecomconfig/edit_optiongroup_master.tpl
  • M framework/modules/ecommerce/views/ecomconfig/manage_groupdiscounts.tpl
  • M framework/modules/ecommerce/views/ecomconfig/manage_promocodes.tpl
  • M framework/modules/ecommerce/views/ecomconfig/manage_upcharge.tpl
  • M framework/modules/ecommerce/views/order/create_new_order.tpl
  • M framework/modules/ecommerce/views/order/edit_address.tpl
  • M framework/modules/ecommerce/views/order/edit_invoice_id.tpl
  • M framework/modules/ecommerce/views/order/edit_shipping_method.tpl
  • M framework/modules/ecommerce/views/order/edit_totals.tpl
  • M framework/modules/ecommerce/views/order/invoice.tpl
  • M framework/modules/ecommerce/views/order/show.tpl
  • M framework/modules/ecommerce/views/order/verifyReturnShopper.tpl
  • M framework/modules/ecommerce/views/order_status/edit.tpl
  • M framework/modules/ecommerce/views/order_status/edit_message.tpl
  • M framework/modules/ecommerce/views/order_type/edit.tpl
  • M framework/modules/ecommerce/views/product_status/edit.tpl
  • M framework/modules/ecommerce/views/purchaseOrder/edit.tpl
  • M framework/modules/ecommerce/views/purchaseOrder/edit_vendor.tpl
  • M framework/modules/ecommerce/views/purchaseOrder/manage.tpl
  • M framework/modules/ecommerce/views/sales_rep/edit.tpl
  • M framework/modules/ecommerce/views/store/batch_process.tpl
  • M framework/modules/ecommerce/views/store/configure/general.tpl
  • M framework/modules/ecommerce/views/store/edit_extrafields.tpl
  • M framework/modules/ecommerce/views/store/edit_featured.tpl
  • M framework/modules/ecommerce/views/store/edit_general.tpl
  • M framework/modules/ecommerce/views/store/edit_meta.tpl
  • M framework/modules/ecommerce/views/store/edit_misc.tpl
  • M framework/modules/ecommerce/views/store/edit_model_alias.tpl
  • M framework/modules/ecommerce/views/store/edit_pricing.tpl
  • M framework/modules/ecommerce/views/store/edit_quantity.tpl
  • M framework/modules/ecommerce/views/store/edit_related.tpl
  • M framework/modules/ecommerce/views/store/edit_shipping.tpl
  • M framework/modules/ecommerce/views/store/edit_userinput.tpl
  • M framework/modules/ecommerce/views/store/import_external_addresses.tpl
  • M framework/modules/ecommerce/views/store/picktype.tpl
  • M framework/modules/ecommerce/views/store/processModelAliases.tpl
  • M framework/modules/ecommerce/views/store/showTopLevel_images.tpl
  • M framework/modules/ecommerce/views/store/showall.tpl
  • M framework/modules/ecommerce/views/storeCategory/configure/general.tpl
  • M framework/modules/ecommerce/views/storeCategory/edit.tpl
  • M framework/modules/ecommerce/views/tax/edit.tpl
  • M framework/modules/ecommerce/views/tax/edit_zone.tpl
  • M framework/modules/file/views/file/picker_cke.tpl
  • M framework/modules/filedownloads/views/filedownload/configure/file_downloads.tpl
  • M framework/modules/filedownloads/views/filedownload/configure/podcast.tpl
  • M framework/modules/flickrfeed/views/flickrfeed/configure/rss_pull.tpl
  • M framework/modules/flowplayer/views/flowplayer/configure/video.tpl
  • M framework/modules/help/views/help/configure/help.tpl
  • M framework/modules/importexport/views/importexport/export.tpl
  • M framework/modules/importexport/views/importexport/import.tpl
  • M framework/modules/importexport/views/importexport/manage.tpl
  • M framework/modules/news/views/news/configure/news.tpl
  • M framework/modules/news/views/news/configure/rss_pull.tpl
  • M framework/modules/photoalbum/views/photos/configure/gallery.tpl
  • M framework/modules/pixidou/assets/js/layout.js
  • M framework/modules/portfolio/views/portfolio/configure/portfolio.tpl
  • M framework/modules/portfolio/views/portfolio/slideshow.tpl
  • M framework/modules/report/views/report/cart_summary.tpl
  • M framework/modules/report/views/report/generateOrderReport.tpl
  • M framework/modules/report/views/report/generateProductReport.tpl
  • M framework/modules/report/views/report/generate_report.tpl
  • M framework/modules/report/views/report/order_report.tpl
  • M framework/modules/report/views/report/product_report.tpl
  • M framework/modules/twitter/views/twitter/configure/twitter.tpl
  • M framework/modules/users/views/users/change_password.tpl
  • M framework/plugins/function.control.php
  • M framework/plugins/function.ddrerank.php
  • M framework/plugins/function.icon.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