Changeset [4ac3186c57c3e261aabd92a85135d84e73b04ba0] by Dave Leffler
March 14th, 2014 @ 01:33 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/conf/extensions/site.defaults.php
framework/core/forms/controls/autocompletecontrol.php
https://github.com/exponentcms/exponent-cms/commit/4ac3186c57c3e261...
Committed by Dave Leffler
- A framework/conf/extensions/ecom.defaults.php
- A framework/conf/extensions/error.defaults.php
- A framework/conf/extensions/help.defaults.php
- A framework/conf/extensions/security.defaults.php
- R framework/conf/extensions/ldap.defaults.php
- R framework/conf/extensions/sef.defaults.php
- M exponent.js.php
- M external/ExtPrograms.csv
- M external/editors/tinymce/jquery.tinymce.min.js
- M external/editors/tinymce/plugins/advlist/plugin.min.js
- M external/editors/tinymce/plugins/autolink/plugin.min.js
- M external/editors/tinymce/plugins/bbcode/plugin.min.js
- M external/editors/tinymce/plugins/directionality/plugin.min.js
- M external/editors/tinymce/plugins/example/plugin.min.js
- M external/editors/tinymce/plugins/fullpage/plugin.min.js
- M external/editors/tinymce/plugins/hr/plugin.min.js
- M external/editors/tinymce/plugins/image/plugin.min.js
- M external/editors/tinymce/plugins/insertdatetime/plugin.min.js
- M external/editors/tinymce/plugins/layer/plugin.min.js
- M external/editors/tinymce/plugins/legacyoutput/plugin.min.js
- M external/editors/tinymce/plugins/link/plugin.min.js
- M external/editors/tinymce/plugins/noneditable/plugin.min.js
- M external/editors/tinymce/plugins/paste/plugin.min.js
- M external/editors/tinymce/plugins/preview/plugin.min.js
- M external/editors/tinymce/plugins/print/plugin.min.js
- M external/editors/tinymce/plugins/save/plugin.min.js
- M external/editors/tinymce/plugins/searchreplace/plugin.min.js
- M external/editors/tinymce/plugins/spellchecker/plugin.min.js
- M external/editors/tinymce/plugins/table/plugin.min.js
- M external/editors/tinymce/plugins/visualblocks/plugin.min.js
- M external/editors/tinymce/plugins/visualchars/plugin.min.js
- M external/editors/tinymce/themes/modern/theme.min.js
- M external/editors/tinymce/tinymce.min.js
- M external/elFinder/css/toolbar.css
- M external/elFinder/img/toolbar.png
- M external/elFinder/js/commands/getfile.js
- M external/elFinder/js/commands/info.js
- M external/elFinder/js/commands/netmount.js
- M external/elFinder/js/elFinder.js
- M external/elFinder/js/elFinder.options.js
- M external/elFinder/js/i18n/elfinder.en.js
- M external/elFinder/js/i18n/elfinder.jp.js
- M external/elFinder/php/elFinder.class.php
- M external/elFinder/php/elFinderConnector.class.php
- M external/elFinder/php/elFinderVolumeDropbox.class.php
- M external/jquery/addons/css/jquery.stepy.css
- M external/jquery/addons/js/jquery.colorbox.js
- M files/uploads/.htaccess
- M framework/conf/extensions/display.defaults.php
- M framework/conf/extensions/filemanager.defaults.php
- M framework/conf/extensions/maint.defaults.php
- M framework/conf/extensions/minify.defaults.php
- M framework/conf/extensions/registration.defaults.php
- M framework/conf/extensions/site.defaults.php
- M framework/core/expFramework.php
- M framework/core/forms/controls/autocompletecontrol.php
- M framework/core/forms/controls/bootstrap/checkboxcontrol.php
- M framework/core/forms/controls/bootstrap/formcontrol.php
- M framework/core/forms/controls/bootstrap/genericcontrol.php
- M framework/core/forms/controls/bootstrap/radiocontrol.php
- M framework/core/forms/controls/calendarcontrol.php
- M framework/core/forms/controls/checkboxcontrol.php
- M framework/core/forms/controls/ckeditorcontrol.php
- M framework/core/forms/controls/genericcontrol.php
- M framework/core/forms/controls/jquery/yuidatetimecontrol.php
- M framework/core/forms/controls/passwordcontrol.php
- M framework/core/forms/controls/popupdatetimecontrol.php
- M framework/core/forms/controls/radiocontrol.php
- M framework/core/forms/controls/rangecontrol.php
- M framework/core/forms/controls/textcontrol.php
- M framework/core/forms/controls/texteditorcontrol.php
- M framework/core/forms/controls/tinymcecontrol.php
- M framework/core/forms/controls/uploadcontrol.php
- M framework/core/forms/controls/yuicalendarcontrol.php
- M framework/core/forms/controls/yuidatetimecontrol.php
- M framework/core/forms/form.php
- M framework/core/subsystems/expJavascript.php
- M framework/modules/core/views/expHTMLEditor/edit.tpl
- M framework/modules/core/views/expHTMLEditor/manage.tpl
- M framework/modules/ecommerce/assets/css/cart.css
- M framework/modules/ecommerce/products/models/eventregistration.php
- M framework/modules/ecommerce/products/views/product/edit.tpl
- M framework/modules/ecommerce/views/cart/checkout.tpl
- M framework/modules/ecommerce/views/cart/confirm.tpl
- M framework/modules/ecommerce/views/cart/preprocess.tpl
- M framework/modules/ecommerce/views/eventregistration/show.tpl
- M framework/modules/ecommerce/views/eventregistration/view_registrants.tpl
- M framework/modules/ecommerce/views/order/partial_summary.tpl
- M framework/modules/file/connector/elFinder.js
- M framework/modules/file/connector/elFinder.options.js
- M framework/modules/file/connector/i18n/elfinder.en.js
- M framework/modules/file/connector/info.js
- M framework/modules/forms/controllers/formsController.php
- M framework/modules/forms/views/forms/enterdata.tpl
- M framework/modules/forms/views/forms/manage.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/text/controllers/textController.php
- M framework/modules/text/views/text/showall_inline.bootstrap.tpl
- M framework/modules/text/views/text/showall_inline.tpl
- M framework/plugins/function.control.php
- M install/upgrades/remove_oldfiles.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