Changeset [cce53e5ec5b2258c847fc3cc2c84e7be92c8d72d] by dleffler
May 23rd, 2015 @ 02:35 PM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/cce53e5ec5b2258c...
Committed by dleffler
- A external/easypost-php-2.1.0/CHANGELOG
- A external/easypost-php-2.1.0/LICENSE
- A external/easypost-php-2.1.0/README.md
- A external/easypost-php-2.1.0/VERSION
- A external/easypost-php-2.1.0/lib/EasyPost/Address.php
- A external/easypost-php-2.1.0/lib/EasyPost/Batch.php
- A external/easypost-php-2.1.0/lib/EasyPost/CarrierAccount.php
- A external/easypost-php-2.1.0/lib/EasyPost/Container.php
- A external/easypost-php-2.1.0/lib/EasyPost/CustomsInfo.php
- A external/easypost-php-2.1.0/lib/EasyPost/CustomsItem.php
- A external/easypost-php-2.1.0/lib/EasyPost/EasyPost.php
- A external/easypost-php-2.1.0/lib/EasyPost/Error.php
- A external/easypost-php-2.1.0/lib/EasyPost/Event.php
- A external/easypost-php-2.1.0/lib/EasyPost/Fee.php
- A external/easypost-php-2.1.0/lib/EasyPost/Item.php
- A external/easypost-php-2.1.0/lib/EasyPost/Object.php
- A external/easypost-php-2.1.0/lib/EasyPost/Order.php
- A external/easypost-php-2.1.0/lib/EasyPost/Parcel.php
- A external/easypost-php-2.1.0/lib/EasyPost/Pickup.php
- A external/easypost-php-2.1.0/lib/EasyPost/PostageLabel.php
- A external/easypost-php-2.1.0/lib/EasyPost/Rate.php
- A external/easypost-php-2.1.0/lib/EasyPost/Refund.php
- A external/easypost-php-2.1.0/lib/EasyPost/Requestor.php
- A external/easypost-php-2.1.0/lib/EasyPost/Resource.php
- A external/easypost-php-2.1.0/lib/EasyPost/ScanForm.php
- A external/easypost-php-2.1.0/lib/EasyPost/Shipment.php
- A external/easypost-php-2.1.0/lib/EasyPost/Tracker.php
- A external/easypost-php-2.1.0/lib/EasyPost/User.php
- A external/easypost-php-2.1.0/lib/EasyPost/Util.php
- A external/easypost-php-2.1.0/lib/cacert.pem
- A external/easypost-php-2.1.0/lib/easypost.php
- A external/editors/tinymce/plugins/quickupload/img/quick_button.gif
- A external/jquery/js/jquery-1.11.3.min.js
- A external/jquery/js/jquery-2.1.4.min.js
- A framework/modules/administration/menus/ecomm1.php
- A framework/modules/administration/menus/ecomm2.php
- A framework/modules/administration/menus/y-navigation.php
- A framework/modules/administration/menus/z-user.php
- A framework/modules/ecommerce/shippingcalculators/easypostcalculator.php
- A framework/modules/ecommerce/shippingcalculators/icons/fedex-logo-ca.png
- A framework/modules/ecommerce/shippingcalculators/icons/ups-logo-ca.png
- A framework/modules/ecommerce/shippingcalculators/icons/usps-logo-ca.png
- A framework/modules/ecommerce/shippingcalculators/views/easypostcalculator/configure.bootstrap3.tpl
- A framework/modules/ecommerce/shippingcalculators/views/easypostcalculator/configure.tpl
- A framework/modules/ecommerce/views/shipping/renderOptions.bootstrap.tpl
- A framework/modules/ecommerce/views/shipping/renderOptions.bootstrap3.tpl
- A framework/modules/events/views/event/showall_announcement.bootstrap3.tpl
- A framework/modules/news/views/news/showall_announcement.bootstrap3.tpl
- A install/changes/2.3.5.txt
- R external/jquery/js/jquery-1.11.2.min.js
- R external/jquery/js/jquery-2.1.3.min.js
- R framework/modules/administration/menus/upcomingevents.php
- R framework/modules/administration/menus/user.php
- R framework/modules/administration/menus/z-navigation.php
- M CHANGELOG.md
- M RELEASE.md
- M exponent_constants.php
- M exponent_version.php
- M external/ExtPrograms.csv
- M external/editors/tinymce/plugins/quickupload/plugin.js
- M external/editors/tinymce/plugins/quickupload/plugin.min.js
- M external/editors/tinymce/themes/modern/theme.min.js
- M external/editors/tinymce/tinymce.min.js
- M external/jquery/addons/css/jquery-impromptu.css
- M external/jquery/addons/css/spectrum.css
- M external/jquery/addons/js/jquery-impromptu.js
- M external/jquery/addons/js/jquery-ui-timepicker-addon.js
- M external/jquery/addons/js/jquery.colorbox.js
- M external/jquery/addons/js/jstree.js
- M external/jquery/addons/js/spectrum.js
- M external/jquery/addons/js/themes/default/style.css
- M external/normalize/normalize.css
- M external/phpThumb/phpThumb.config.php
- M external/phpThumb/phpThumb.php
- M framework/conf/extensions/ecom.defaults.php
- M framework/core/assets/less/accordion.less
- M framework/core/expFramework.php
- M framework/core/subsystems/expCSS.php
- M framework/core/subsystems/expHistory.php
- M framework/core/subsystems/expJavascript.php
- M framework/core/subsystems/expPermissions.php
- M framework/core/subsystems/expSession.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/addressbook/views/address/myaddressbook.tpl
- M framework/modules/administration/assets/css/slingbar.css
- M framework/modules/administration/assets/less/exp-toolbar.less
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/menus/ecomm.php
- M framework/modules/administration/views/administration/configure_site.bootstrap3.tpl
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/administration/views/administration/toolbar.bootstrap3.tpl
- M framework/modules/administration/views/administration/toolbar.newui.tpl
- M framework/modules/blog/views/blog/blogitem.tpl
- M framework/modules/container/controllers/containerController.php
- M framework/modules/ecommerce/assets/css/cart.css
- M framework/modules/ecommerce/billingcalculators/authorizedotnet.php
- M framework/modules/ecommerce/billingcalculators/cash.php
- M framework/modules/ecommerce/billingcalculators/creditcard.php
- M framework/modules/ecommerce/billingcalculators/passthru.php
- M framework/modules/ecommerce/billingcalculators/payflowpro.php
- M framework/modules/ecommerce/billingcalculators/paylater.php
- M framework/modules/ecommerce/billingcalculators/paypalExpressCheckout.php
- M framework/modules/ecommerce/billingcalculators/splitcreditcard.php
- M framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.bootstrap3.tpl
- M framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.tpl
- M framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.bootstrap3.tpl
- M framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl
- M framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.bootstrap3.tpl
- M framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl
- M framework/modules/ecommerce/billingcalculators/worldpayCheckout.php
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/ecommerce/controllers/orderController.php
- M framework/modules/ecommerce/controllers/shippingController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/definitions/orders.php
- M framework/modules/ecommerce/definitions/shippingmethods.php
- M framework/modules/ecommerce/models/billing.php
- M framework/modules/ecommerce/models/billingcalculator.php
- M framework/modules/ecommerce/models/billingmethod.php
- M framework/modules/ecommerce/models/billingtransaction.php
- M framework/modules/ecommerce/models/shipping.php
- M framework/modules/ecommerce/models/shippingcalculator.php
- M framework/modules/ecommerce/products/models/product.php
- M framework/modules/ecommerce/products/views/product/edit.bootstrap3.tpl
- M framework/modules/ecommerce/products/views/product/edit.tpl
- M framework/modules/ecommerce/shippingcalculators/fedexcalculator.php
- M framework/modules/ecommerce/shippingcalculators/tablebasedcalculator.php
- M framework/modules/ecommerce/shippingcalculators/upscalculator.php
- M framework/modules/ecommerce/shippingcalculators/views/fedexcalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/fedexcalculator/configure.tpl
- M framework/modules/ecommerce/shippingcalculators/views/flatratecalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/flatratecalculator/configure.tpl
- M framework/modules/ecommerce/shippingcalculators/views/instorepickupcalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/instorepickupcalculator/configure.tpl
- M framework/modules/ecommerce/shippingcalculators/views/peritemcalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/peritemcalculator/configure.tpl
- M framework/modules/ecommerce/shippingcalculators/views/perweightcalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/perweightcalculator/configure.tpl
- M framework/modules/ecommerce/shippingcalculators/views/tablebasedcalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/tablebasedcalculator/configure.tpl
- M framework/modules/ecommerce/shippingcalculators/views/upscalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/upscalculator/configure.tpl
- M framework/modules/ecommerce/views/billing/payflowpro.tpl
- M framework/modules/ecommerce/views/cart/checkout.bootstrap3.tpl
- M framework/modules/ecommerce/views/cart/checkout.tpl
- M framework/modules/ecommerce/views/cart/confirm.tpl
- M framework/modules/ecommerce/views/order/edit_payment_info.tpl
- M framework/modules/ecommerce/views/order/email_invoice.tpl
- M framework/modules/ecommerce/views/order/invoice.bootstrap3.tpl
- M framework/modules/ecommerce/views/order/invoice.tpl
- M framework/modules/ecommerce/views/order/myOrder.tpl
- M framework/modules/ecommerce/views/order/show.bootstrap3.tpl
- M framework/modules/ecommerce/views/order/show.tpl
- M framework/modules/ecommerce/views/order/show_packing.bootstrap3.tpl
- M framework/modules/ecommerce/views/order/show_packing.tpl
- M framework/modules/ecommerce/views/order/showall.bootstrap3.tpl
- M framework/modules/ecommerce/views/order/showall.tpl
- M framework/modules/ecommerce/views/shipping/renderOptions.tpl
- M framework/modules/ecommerce/views/store/manage.bootstrap3.tpl
- M framework/modules/ecommerce/views/store/manage.tpl
- M framework/modules/ecommerce/views/store/show.bootstrap3.tpl
- M framework/modules/ecommerce/views/store/show.tpl
- M framework/modules/events/assets/css/announcement.css
- M framework/modules/events/views/event/showall_announcement.tpl
- M framework/modules/facebook/views/facebook/showall.tpl
- M framework/modules/file/connector/uploader_tinymce.php
- M framework/modules/links/controllers/linksController.php
- M framework/modules/navigation/views/navigation/showall_Flydown.bootstrap3.tpl
- M framework/modules/news/assets/css/announcement.css
- M framework/modules/report/controllers/reportController.php
- M framework/modules/report/views/report/abandoned_carts.tpl
- M framework/modules/report/views/report/current_carts.tpl
- M framework/modules/search/assets/css/results.css
- M framework/plugins/bootstrap/block.pop.php
- M framework/plugins/bootstrap3/block.pop.php
- M framework/plugins/function.control.php
- M framework/plugins/function.ecomconfig.php
- M framework/plugins/function.getnav.php
- M framework/plugins/function.google_map.php
- M framework/plugins/function.img.php
- M framework/plugins/function.prod_images.php
- M index.php
- M install/index.php
- M install/samples/ecommerce.eql
- M install/samples/store.eql
- M install/upgrades/clear_cache.php
- M install/upgrades/remove_oldfiles.php
- M install/upgrades/update_ecom3.php
- M install/upgrades/update_page_ranks.php
- M thumb.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