Changeset [2f9ac7c7035b584a95c5bfc9eea47ae4f0f38744] by dleffler
February 16th, 2014 @ 09:22 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
external/bootstrap/less/bootstrap.less
external/bootstrap/less/responsive.less
framework/core/subsystems/expCSS.php
themes/bootstraptheme/less/variables.less
https://github.com/exponentcms/exponent-cms/commit/2f9ac7c7035b584a...
Committed by dleffler
- A external/jquery/addons/css/dataTables.bootstrap.css
- A external/jquery/addons/css/dataTables.tableTools.css
- A external/jquery/addons/images/background.png
- A external/jquery/addons/images/collection.png
- A external/jquery/addons/images/collection_hover.png
- A external/jquery/addons/images/copy.png
- A external/jquery/addons/images/copy_hover.png
- A external/jquery/addons/images/csv.png
- A external/jquery/addons/images/csv_hover.png
- A external/jquery/addons/images/pdf.png
- A external/jquery/addons/images/pdf_hover.png
- A external/jquery/addons/images/print.png
- A external/jquery/addons/images/print_hover.png
- A external/jquery/addons/images/xls.png
- A external/jquery/addons/images/xls_hover.png
- A external/jquery/addons/js/dataTables.bootstrap.js
- A external/jquery/addons/js/dataTables.tableTools.js
- A external/jquery/addons/swf/copy_csv_xls.swf
- A external/jquery/addons/swf/copy_csv_xls_pdf.swf
- A framework/modules/forms/assets/css/datatables-tools.css
- A framework/modules/users/assets/css/datatables-tools.css
- M external/ExtPrograms.csv
- M external/bootstrap/css/bootstrap.css
- M external/bootstrap/less/bootstrap.less
- M external/bootstrap/less/responsive.less
- M external/jquery/addons/css/jquery.dataTables.css
- M external/jquery/addons/images/sort_asc_disabled.png
- M external/jquery/addons/js/datatables.responsive.js
- M external/jquery/addons/js/jquery.dataTables.js
- M external/jquery/addons/js/lodash.min.js
- M framework/core/subsystems/expCSS.php
- M framework/modules/forms/views/forms/showall.bootstrap.tpl
- M framework/modules/forms/views/forms/showall.tpl
- M framework/modules/users/views/users/_permissions.bootstrap.tpl
- M framework/modules/users/views/users/_permissions.tpl
- M framework/modules/users/views/users/manage.bootstrap.tpl
- M framework/modules/users/views/users/manage.tpl
- M framework/modules/users/views/users/manage_group_memberships.bootstrap.tpl
- M framework/modules/users/views/users/manage_group_memberships.tpl
- M framework/modules/users/views/users/manage_groups.bootstrap.tpl
- M framework/modules/users/views/users/manage_groups.tpl
- M themes/bootstraptheme/class.php
- M themes/bootstraptheme/less/variables.less
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