Changeset [e20937eb5e706bd87ab1a410fb16a35067f9edb2] by dleffler
April 24th, 2014 @ 03:03 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/core/forms/fakeform.php
https://github.com/exponentcms/exponent-cms/commit/e20937eb5e706bd8...
Committed by dleffler
- A framework/core/assets/less/datatables-tools.less
- R external/jquery/addons/js/DT_bootstrap.js
- R framework/modules/forms/assets/css/datatables-tools.css
- R framework/modules/users/assets/css/datatables-tools.css
- M CHANGELOG.md
- M external/ExtPrograms.csv
- M external/jquery/addons/css/datatables.responsive.css
- M external/jquery/addons/css/jquery.dataTables.css
- M external/jquery/addons/js/datatables.responsive.js
- M external/jquery/addons/js/jquery.dataTables.js
- M framework/core/forms/baseform.php
- M framework/core/forms/controls/bootstrap/checkboxcontrol.php
- M framework/core/forms/controls/bootstrap/formcontrol.php
- M framework/core/forms/controls/calendarcontrol.php
- M framework/core/forms/controls/checkboxcontrol.php
- M framework/core/forms/controls/formcontrol.php
- M framework/core/forms/controls/hiddenfieldcontrol.php
- M framework/core/forms/controls/jquery/calendarcontrol.php
- M framework/core/forms/controls/jquery/yuicalendarcontrol.php
- M framework/core/forms/controls/textcontrol.php
- M framework/core/forms/controls/texteditorcontrol.php
- M framework/core/forms/controls/yuicalendarcontrol.php
- M framework/core/forms/fakeform.php
- M framework/core/forms/form.php
- M framework/modules/administration/menus/admin.php
- M framework/modules/administration/views/administration/toolbar.bootstrap.tpl
- M framework/modules/administration/views/administration/toolbar.tpl
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/views/eventregistration/view_registrants.bootstrap.tpl
- M framework/modules/forms/controllers/formsController.php
- M framework/modules/forms/views/forms/showall.bootstrap.tpl
- M framework/modules/users/views/users/_permissions.bootstrap.tpl
- M framework/modules/users/views/users/manage.bootstrap.tpl
- M framework/modules/users/views/users/manage_group_memberships.bootstrap.tpl
- M framework/modules/users/views/users/manage_groups.bootstrap.tpl
- M install/changes/2.3.0.txt
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