Changeset [2c317c7f3a47f9e0726bff63789ded78b5ec72a7] by dleffler
May 18th, 2013 @ 12:16 AM
Merge branch 'develop' into feature/v2.2.1
https://github.com/exponentcms/exponent-cms/commit/2c317c7f3a47f9e0...
Committed by dleffler
- A external/editors/ckeditor/plugins/htmlsource/plugin.js
- A framework/core/forms/controls/bootstrap/checkboxcontrol.php
- A framework/core/forms/controls/bootstrap/dropdowncontrol.php
- A framework/core/forms/controls/bootstrap/formcontrol.php
- A framework/core/forms/controls/bootstrap/genericcontrol.php
- A framework/modules/container/views/container/edit.bootstrap.tpl
- A framework/modules/users/views/login/showlogin.bootstrap.tpl
- A install/changes/2.2.1.txt
- A themes/bootstraptheme/less/bootstrapcontrols.less
- A themes/bootstraptheme/modules/navigation/views/navigation/bootstrap_dropdowns.tpl
- M CHANGELOG.md
- M RELEASE.md
- M exponent_version.php
- M framework/core/expFramework.php
- M framework/core/forms/controls/bootstrap/buttongroupcontrol.php
- M framework/core/forms/form.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/core/subsystems/expTheme.php
- M framework/modules/container/assets/css/add-content.css
- M framework/modules/container/assets/css/admin-container.css
- M framework/modules/container/views/container/edit.tpl
- M framework/modules/container/views/container/showall_flyoutsidebar.tpl
- M framework/modules/container/views/container/showall_flyoutsidebarYUI.tpl
- M framework/modules/container/views/container/showall_flyoutsidebar_left.tpl
- M framework/modules/countdown/views/countdown/configure/countdown.tpl
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/ecommerce/products/models/eventregistration.php
- M framework/modules/ecommerce/products/models/product.php
- M framework/modules/ecommerce/views/eventregistration/show.tpl
- M framework/modules/ecommerce/views/store/edit_featured.tpl
- M framework/modules/ecommerce/views/store/edit_images.tpl
- M framework/modules/file/views/file/export_eql.tpl
- M framework/modules/file/views/file/export_files.tpl
- M framework/modules/forms/views/forms/edit_form.tpl
- M framework/modules/forms/views/forms/enterdata.tpl
- M framework/modules/forms/views/forms/import_csv_data.tpl
- M framework/modules/forms/views/forms/import_csv_data_display.tpl
- M framework/modules/help/views/help/select_version.tpl
- M framework/modules/navigation/views/navigation/edit_contentpage.tpl
- M framework/modules/navigation/views/navigation/manage_hierarchy.tpl
- M framework/modules/report/views/report/dashboard.tpl
- M framework/modules/search/assets/css/show-form.css
- M framework/modules/search/views/search/show.tpl
- M framework/modules/search/views/search/showall.tpl
- M framework/modules/text/controllers/textController.php
- M framework/modules/text/views/text/showall_inline.tpl
- M framework/modules/users/views/login/showlogin.tpl
- M framework/modules/users/views/login/showlogin_expanded.tpl
- M framework/modules/users/views/login/showlogin_flyout.tpl
- M framework/modules/users/views/login/showlogin_flyoutYUI.tpl
- M framework/modules/users/views/login/showlogin_stacked.tpl
- M framework/modules/users/views/login/showlogin_vertical.tpl
- M framework/modules/users/views/users/import_users_add.tpl
- M framework/modules/users/views/users/import_users_display.tpl
- M framework/plugins/block.form.php
- M install/changes/2.2.0.txt
- M install/upgrades/remove_oldfiles.php
- M install/upgrades/update_countdown.php
- M themes/bootstraptheme/index.php
- M themes/bootstraptheme/less/bootstraptheme.less
- M themes/bootstraptheme/modules/search/views/search/show.tpl
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