Changeset [df55097852519fdf741471abfef485d6c87efddd] by dleffler
January 12th, 2015 @ 04:43 PM
Merge branch 'develop'
Conflicts:
CHANGELOG.md install/changes/2.3.3.txt
https://github.com/exponentcms/exponent-cms/commit/df55097852519fdf...
Committed by dleffler
- A framework/modules/ecommerce/views/store/input_fields.tpl
- A framework/modules/ecommerce/views/store/options.tpl
- A framework/modules/navigation/views/navigation/edit_section.tpl
- R external/jquery/addons/js/pwstrength-bootstrap-1.2.2.js
- R framework/modules/navigation/views/navigation/add_section.tpl
- M exponent.php
- M external/ExtPrograms.csv
- M external/jquery/addons/css/jquery-impromptu.css
- M external/jquery/addons/js/jquery-impromptu.js
- M external/jquery/addons/js/jstree.js
- M external/jquery/addons/js/themes/default-dark/style.css
- M framework/core/forms/controls/bootstrap/checkboxcontrol.php
- M framework/core/forms/controls/bootstrap/datetimecontrol.php
- M framework/core/forms/controls/bootstrap/dropdowncontrol.php
- M framework/core/forms/controls/bootstrap/genericcontrol.php
- M framework/core/forms/controls/bootstrap/radiocontrol.php
- M framework/core/forms/controls/bootstrap/textcontrol.php
- M framework/core/forms/controls/bootstrap3/checkboxcontrol.php
- M framework/core/forms/controls/bootstrap3/datetimecontrol.php
- M framework/core/forms/controls/bootstrap3/dropdowncontrol.php
- M framework/core/forms/controls/bootstrap3/listbuildercontrol.php
- M framework/core/forms/controls/bootstrap3/radiocontrol.php
- M framework/core/forms/controls/bootstrap3/radiogroupcontrol.php
- M framework/core/forms/controls/bootstrap3/yuicalendarcontrol.php
- M framework/core/forms/controls/calendarcontrol.php
- M framework/core/forms/controls/checkboxcontrol.php
- M framework/core/forms/controls/countrycontrol.php
- M framework/core/forms/controls/datetimecontrol.php
- M framework/core/forms/controls/dropdowncontrol.php
- M framework/core/forms/controls/genericcontrol.php
- M framework/core/forms/controls/hiddenfieldcontrol.php
- M framework/core/forms/controls/jquery/calendarcontrol.php
- M framework/core/forms/controls/jquery/listbuildercontrol.php
- M framework/core/forms/controls/jquery/popupdatetimecontrol.php
- M framework/core/forms/controls/jquery/yuicalendarcontrol.php
- M framework/core/forms/controls/listbuildercontrol.php
- M framework/core/forms/controls/newui/checkboxcontrol.php
- M framework/core/forms/controls/newui/datetimecontrol.php
- M framework/core/forms/controls/newui/dropdowncontrol.php
- M framework/core/forms/controls/newui/genericcontrol.php
- M framework/core/forms/controls/newui/radiocontrol.php
- M framework/core/forms/controls/newui/radiogroupcontrol.php
- M framework/core/forms/controls/pagecontrol.php
- M framework/core/forms/controls/popupdatetimecontrol.php
- M framework/core/forms/controls/radiocontrol.php
- M framework/core/forms/controls/radiogroupcontrol.php
- M framework/core/forms/controls/statescontrol.php
- M framework/core/forms/controls/textcontrol.php
- M framework/core/forms/controls/texteditorcontrol.php
- M framework/core/forms/controls/uploadcontrol.php
- M framework/core/forms/controls/yuicalendarcontrol.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/Portuguese.php
- M framework/core/lang/Suomi.php
- M framework/core/models/expRecord.php
- M framework/core/subsystems/expHtmlToPDF.php
- M framework/core/subsystems/expLang.php
- M framework/core/subsystems/expRouter.php
- M framework/core/subsystems/expSession.php
- M framework/core/subsystems/expString.php
- M framework/core/subsystems/expTheme.php
- M framework/core/subsystems/expValidator.php
- M framework/modules/addressbook/models/address.php
- M framework/modules/addressbook/models/external_address.php
- M framework/modules/addressbook/views/address/edit.bootstrap3.tpl
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/menus/admin.php
- M framework/modules/administration/menus/upcomingevents.php
- M framework/modules/core/controllers/expDefinableFieldController.php
- M framework/modules/core/controllers/expSimpleNoteController.php
- M framework/modules/core/models/expSimpleNote.php
- M framework/modules/core/views/expSimpleNote/edit.tpl
- M framework/modules/core/views/expSimpleNote/getNotes.tpl
- M framework/modules/core/views/expSimpleNote/manage.tpl
- M framework/modules/ecommerce/assets/css/cart.css
- M framework/modules/ecommerce/assets/css/options-edit.css
- M framework/modules/ecommerce/assets/css/storefront.css
- M framework/modules/ecommerce/assets/css/storefront_bs3.css
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/ecommerce/controllers/orderController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/definitions/product.php
- M framework/modules/ecommerce/definitions/promocodes.php
- M framework/modules/ecommerce/models/orderitem.php
- M framework/modules/ecommerce/models/promocodes.php
- M framework/modules/ecommerce/products/models/donation.php
- M framework/modules/ecommerce/products/models/giftcard.php
- M framework/modules/ecommerce/products/models/product.php
- M framework/modules/ecommerce/products/views/donation/addToCart.tpl
- M framework/modules/ecommerce/products/views/eventregistration/addToCart.tpl
- M framework/modules/ecommerce/products/views/giftcard/addToCart.tpl
- M framework/modules/ecommerce/products/views/giftcard/cartSummary.tpl
- M framework/modules/ecommerce/products/views/giftcard/edit.bootstrap3.tpl
- M framework/modules/ecommerce/products/views/giftcard/edit.tpl
- M framework/modules/ecommerce/products/views/giftcard/formatExtraData.tpl
- M framework/modules/ecommerce/products/views/product/addToCart.tpl
- M framework/modules/ecommerce/products/views/product/addToOrder.tpl
- M framework/modules/ecommerce/products/views/product/options_partial.tpl
- M framework/modules/ecommerce/products/views/product/storeListing.bootstrap3.tpl
- M framework/modules/ecommerce/products/views/product/storeListing.tpl
- M framework/modules/ecommerce/views/ecomconfig/manage_groupdiscounts.tpl
- M framework/modules/ecommerce/views/ecomconfig/manage_promocodes.tpl
- M framework/modules/ecommerce/views/eventregistration/show.tpl
- M framework/modules/ecommerce/views/order/add_order_item.tpl
- M framework/modules/ecommerce/views/order/edit_order_item.tpl
- M framework/modules/ecommerce/views/order/show.bootstrap3.tpl
- M framework/modules/ecommerce/views/store/edit_categories.tpl
- M framework/modules/ecommerce/views/store/edit_featured.tpl
- M framework/modules/ecommerce/views/store/edit_images.tpl
- M framework/modules/ecommerce/views/store/edit_meta.tpl
- M framework/modules/ecommerce/views/store/edit_model.tpl
- M framework/modules/ecommerce/views/store/edit_notes.tpl
- M framework/modules/ecommerce/views/store/edit_options.tpl
- M framework/modules/ecommerce/views/store/edit_pricing.tpl
- M framework/modules/ecommerce/views/store/edit_related.tpl
- M framework/modules/ecommerce/views/store/edit_userinput.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.tpl
- M framework/modules/ecommerce/views/store/showGiftCards.tpl
- M framework/modules/forms/controllers/formsController.php
- M framework/modules/forms/views/forms/enterdata.tpl
- M framework/modules/forms/views/forms/show.tpl
- M framework/modules/forms/views/forms/showall.bootstrap.tpl
- M framework/modules/forms/views/forms/showall.tpl
- M framework/modules/forms/views/forms/showall_portfolio.tpl
- M framework/modules/importexport/controllers/importexportController.php
- M framework/modules/migration/controllers/migrationController.php
- M framework/modules/report/controllers/reportController.php
- M framework/modules/twitter/views/twitter/showall.tpl
- M framework/modules/users/controllers/usersController.php
- M framework/modules/users/models/user.php
- M framework/modules/users/views/users/change_password.bootstrap3.tpl
- M framework/modules/users/views/users/edit_userpassword.bootstrap3.tpl
- M framework/modules/users/views/users/edituser.bootstrap3.tpl
- M framework/plugins/function.optiondisplayer.php
- M framework/plugins/function.simplenote.php
- M index.php
- M install/index.php
- M install/pages/install-3.php
- M install/upgrades/remove_oldfiles.php
- M install/upgrades/update_ecom3.php
- M selector.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