Changeset [95e45f1e8849b986ef2e9a20357a0813fe79a4e9] by dleffler
April 8th, 2014 @ 12:23 AM
Merge branch 'bootstrap3dave' into bs3newui
Conflicts:
framework/plugins/block.form.php
https://github.com/exponentcms/exponent-cms/commit/95e45f1e8849b986...
Committed by dleffler
- A framework/core/views/_msg_queue.bootstrap.tpl
- R popup.php
- M external/ExtPrograms.csv
- M external/editors/tinymce/plugins/autoresize/plugin.min.js
- M external/editors/tinymce/plugins/emoticons/plugin.min.js
- M external/editors/tinymce/plugins/example/plugin.min.js
- M external/editors/tinymce/plugins/image/plugin.min.js
- M external/editors/tinymce/plugins/link/plugin.min.js
- M external/editors/tinymce/plugins/media/plugin.min.js
- M external/editors/tinymce/plugins/paste/plugin.min.js
- M external/editors/tinymce/plugins/table/plugin.min.js
- M external/editors/tinymce/skins/lightgray/fonts/tinymce-small.eot
- M external/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg
- M external/editors/tinymce/skins/lightgray/fonts/tinymce-small.ttf
- M external/editors/tinymce/skins/lightgray/fonts/tinymce-small.woff
- M external/editors/tinymce/skins/lightgray/fonts/tinymce.eot
- M external/editors/tinymce/skins/lightgray/fonts/tinymce.svg
- M external/editors/tinymce/skins/lightgray/fonts/tinymce.ttf
- M external/editors/tinymce/skins/lightgray/fonts/tinymce.woff
- M external/editors/tinymce/skins/lightgray/skin.ie7.min.css
- M external/editors/tinymce/skins/lightgray/skin.min.css
- M external/editors/tinymce/themes/modern/theme.min.js
- M external/editors/tinymce/tinymce.min.js
- M external/jquery/addons/js/jquery.colorbox.js
- M external/mediaelement/README.md
- M external/mediaelement/build/flashmediaelement-cdn.swf
- M external/mediaelement/build/flashmediaelement.swf
- M external/mediaelement/build/mediaelement-and-player.js
- M external/mediaelement/build/mediaelement-and-player.min.js
- M external/mediaelement/build/mediaelement.js
- M external/mediaelement/build/mediaelement.min.js
- M external/mediaelement/build/mediaelementplayer.css
- M external/mediaelement/build/mediaelementplayer.js
- M external/mediaelement/build/mediaelementplayer.min.css
- M external/mediaelement/build/mediaelementplayer.min.js
- M framework/core/controllers/expController.php
- M framework/core/expFramework.php
- M framework/core/forms/basetemplate.php
- M framework/core/forms/controllertemplate.php
- M framework/core/forms/controls/bootstrap/datetimecontrol.php
- M framework/core/forms/filetemplate.php
- M framework/core/forms/formtemplate.php
- M framework/core/forms/standalonetemplate.php
- M framework/core/forms/template.php
- M framework/core/subsystems/expCore.php
- M framework/core/subsystems/expPaginator.php
- M framework/core/subsystems/expTemplate.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/container/controllers/containerController.php
- M framework/modules/container/views/container/edit.bootstrap.tpl
- M framework/modules/container/views/container/edit.tpl
- M framework/modules/eaas/controllers/eaasController.php
- M framework/modules/ealerts/controllers/ealertController.php
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/ecommerce/controllers/ecomconfigController.php
- M framework/modules/ecommerce/controllers/orderController.php
- M framework/modules/ecommerce/controllers/storeCategoryController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/products/models/eventregistration.php
- M framework/modules/ecommerce/products/models/giftcard.php
- M framework/modules/ecommerce/products/models/product.php
- M framework/modules/events/controllers/eventController.php
- M framework/modules/file/connector/elFinderVolumeExponent.class.php
- M framework/modules/file/controllers/fileController.php
- M framework/modules/forms/controllers/formsController.php
- M framework/modules/importexport/controllers/importexportController.php
- M framework/modules/migration/controllers/migrationController.php
- M framework/modules/users/controllers/usersController.php
- M framework/modules/users/views/users/edituser.tpl
- M framework/plugins/function.control.php
- M framework/plugins/function.filedisplayer.php
- M framework/plugins/function.optiondisplayer.php
- M framework/plugins/function.viewfile.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