Changeset [26ef7b61b3f3b1b0fd4ed60763457053dc3c9d2e] by dleffler
February 22nd, 2014 @ 12:41 AM
Merge branch 'develop' into bootstrap3dave
Conflicts:
external/ExtPrograms.csv
framework/core/subsystems/expJavascript.php
https://github.com/exponentcms/exponent-cms/commit/26ef7b61b3f3b1b0...
Committed by dleffler
- A external/jquery/js/jquery-2.1.0.min.js
- A framework/core/forms/controls/jquery/calendarcontrol.php
- A framework/core/forms/controls/jquery/listbuildercontrol.php
- A framework/core/forms/controls/jquery/tagpickercontrol.php
- A framework/core/forms/controls/jquery/yuicalendarcontrol.php
- A framework/core/forms/controls/jquery/yuidatetimecontrol.php
- A framework/plugins/bootstrap/function.help.php
- A framework/plugins/bootstrap/function.subscribe_link.php
- A themes/bootstraptheme/editors/tinymce/tinymce.css
- A themes/simpletheme/editors/tinymce/tinymce.css
- A themes/simpletheme/editors/tinymce/tinymce_Fall.css
- R framework/core/forms/controls/bootstrap/calendarcontrol.php
- R framework/core/forms/controls/bootstrap/listbuildercontrol.php
- R framework/core/forms/controls/bootstrap/tagpickercontrol.php
- R framework/core/forms/controls/bootstrap/yuicalendarcontrol.php
- R framework/core/forms/controls/bootstrap/yuidatetimecontrol.php
- M exponent_constants.php
- M external/ExtPrograms.csv
- M framework/core/forms/controls/ckeditorcontrol.php
- M framework/core/forms/controls/tinymcecontrol.php
- M framework/core/subsystems/expJavascript.php
- M framework/modules/core/views/expComment/edit.tpl
- M framework/modules/core/views/expHTMLEditor/manage.tpl
- M framework/modules/core/views/expSimpleNote/edit.tpl
- M framework/modules/ecommerce/products/views/product/edit.tpl
- M framework/modules/text/views/text/showall_inline.bootstrap.tpl
- M framework/modules/text/views/text/showall_inline.tpl
- M install/popups/db_create.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