Changeset [a15f7f23063ea47cb4e97660469d3601d619ba1e] by dleffler
March 29th, 2013 @ 04:48 PM
Merge branch 'release/v2.1.4'
https://github.com/exponentcms/exponent-cms/commit/a15f7f23063ea47c...
Committed by dleffler
- A framework/modules/eaas/controllers/eaasController.php
- A framework/modules/eaas/views/eaas/configure/Blog.tpl
- A framework/modules/eaas/views/eaas/configure/Events.tpl
- A framework/modules/eaas/views/eaas/configure/File_Downloads.tpl
- A framework/modules/eaas/views/eaas/configure/News.tpl
- A framework/modules/eaas/views/eaas/configure/Photo.tpl
- A framework/modules/eaas/views/eaas/configure/YouTube.tpl
- A framework/modules/eaas/views/eaas/configure/about_us.tpl
- A framework/modules/eaas/views/eaas/edit.tpl
- A framework/modules/eaas/views/eaas/showall.tpl
- A framework/modules/ecommerce/views/eventregistration/edit_registrant.tpl
- A framework/modules/users/views/users/email/confirm_password_email.tpl
- A framework/modules/users/views/users/email/password_reset_email.tpl
- A install/changes/2.1.4.txt
- R framework/modules/users/views/email/confirm_password_email.tpl
- R framework/modules/users/views/email/password_reset_email.tpl
- M .htaccess
- M CHANGELOG.md
- M conf/data/date_format.dropdown
- M conf/data/datetime_format.dropdown
- M conf/data/time_format.dropdown
- M conf/extensions/display.defaults.php
- M cron/generateSiteMap.php
- M cron/generateXMLFeed.php
- M exponent_version.php
- M external/ExtPrograms.csv
- M external/SimpleAjaxUploader.js
- M external/adminer/admin.php
- M files/avatars/.htaccess
- M files/uploads/.htaccess
- M framework/core/controllers/expController.php
- M framework/core/controllers/expHTMLEditorController.php
- M framework/core/expFramework.php
- M framework/core/models/expCat.php
- M framework/core/models/expComment.php
- M framework/core/models/expDefinableField.php
- M framework/core/models/expRating.php
- M framework/core/models/expSimpleNote.php
- M framework/core/models/expTag.php
- M framework/core/subsystems/expAjaxReply.php
- M framework/core/subsystems/expJavascript.php
- M framework/core/subsystems/expSettings.php
- M framework/core/subsystems/expVersion.php
- M framework/core/subsystems/forms/controls/checkboxcontrol.php
- M framework/core/subsystems/forms/controls/filemanagercontrol.php
- M framework/core/subsystems/forms/controls/radiocontrol.php
- M framework/core/subsystems/forms/form.php
- M framework/modules-1/containermodule/views/Tabbed.tpl
- M framework/modules-1/importer/views/_eql_results.tpl
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/menus/admin.php
- M framework/modules/administration/views/administration/toolbar.tpl
- M framework/modules/blog/controllers/blogController.php
- M framework/modules/core/views/expHTMLEditor/edit.tpl
- M framework/modules/ecommerce/assets/css/eventregistration.css
- M framework/modules/ecommerce/billingcalculators/cash.php
- M framework/modules/ecommerce/billingcalculators/paypalExpressCheckout.php
- M framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/ecommerce/controllers/donationController.php
- M framework/modules/ecommerce/controllers/eventregistrationController.php
- M framework/modules/ecommerce/controllers/shippingController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/definitions/eventregistration.php
- M framework/modules/ecommerce/models/storeCategory.php
- M framework/modules/ecommerce/models/storeCategoryFeeds.php
- M framework/modules/ecommerce/products/models/eventregistration.php
- M framework/modules/ecommerce/products/models/giftcard.php
- M framework/modules/ecommerce/products/models/product.php
- M framework/modules/ecommerce/products/views/eventregistration/edit.tpl
- M framework/modules/ecommerce/products/views/eventregistration/formatExtraData.tpl
- M framework/modules/ecommerce/products/views/product/addToCart.tpl
- M framework/modules/ecommerce/products/views/product/cartSummary.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/storeListing.tpl
- M framework/modules/ecommerce/views/cart/checkout.tpl
- M framework/modules/ecommerce/views/cart/quickPay.tpl
- M framework/modules/ecommerce/views/cart/show_cart_only.tpl
- M framework/modules/ecommerce/views/cart/show_inline.tpl
- M framework/modules/ecommerce/views/cart/show_quickpay_donation_cart.tpl
- M framework/modules/ecommerce/views/ecomconfig/configure.tpl
- M framework/modules/ecommerce/views/eventregistration/show.tpl
- M framework/modules/ecommerce/views/eventregistration/view_registrants.tpl
- M framework/modules/ecommerce/views/order/edit_order_item.tpl
- M framework/modules/ecommerce/views/order/invoice.tpl
- M framework/modules/ecommerce/views/order/show_packing.tpl
- M framework/modules/ecommerce/views/store/edit_extrafields.tpl
- M framework/modules/ecommerce/views/store/edit_pricing.tpl
- M framework/modules/ecommerce/views/store/nonUnicodeProducts.tpl
- M framework/modules/ecommerce/views/store/show.tpl
- M framework/modules/events/controllers/eventController.php
- M framework/modules/events/models/event.php
- M framework/modules/events/models/eventdate.php
- M framework/modules/events/views/event/_recurring.tpl
- M framework/modules/events/views/event/configure/pull_google.tpl
- M framework/modules/events/views/event/configure/pull_ical.tpl
- M framework/modules/events/views/event/month.tpl
- M framework/modules/file/models/expFile.php
- M framework/modules/forms/controllers/formsController.php
- M framework/modules/forms/models/forms.php
- M framework/modules/help/controllers/helpController.php
- M framework/modules/help/models/help_version.php
- M framework/modules/importexport/controllers/importexportController.php
- M framework/modules/motd/controllers/motdController.php
- M framework/modules/navigation/controllers/navigationController.php
- M framework/modules/news/controllers/newsController.php
- M framework/modules/photoalbum/controllers/photosController.php
- M framework/modules/portfolio/controllers/portfolioController.php
- M framework/modules/simplepoll/controllers/simplePollController.php
- M framework/modules/simplepoll/models/simplepoll_question.php
- M framework/modules/text/views/text/showall_accordion.tpl
- M framework/modules/text/views/text/showall_tabbed.tpl
- M framework/modules/users/controllers/usersController.php
- M framework/modules/users/views/users/edituser.tpl
- M framework/modules/youtube/definitions/youtube.php
- M framework/plugins/block.toggle.php
- M index.php
- M install/index.php
- M install/pages/final.php
- M install/pages/install-1.php
- M install/pages/install-3.php
- M install/pages/upgrade-1.php
- M install/pages/welcome.php
- M install/upgrades/upgrade_calendar.php
- M install/upgrades/upgrade_forms.php
- M install/upgrades/upgrade_navigation.php
- M install/upgrades/version_tracking.php
- M login.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