Changeset [91ed86b7b13d8842ab01241c49c30de41610981a] by dleffler
April 18th, 2014 @ 08:53 PM
Merge branch 'bootstrap3dave' into bs3newui
Conflicts:
framework/modules/text/views/text/showall_inline.bootstrap3.tpl
https://github.com/exponentcms/exponent-cms/commit/91ed86b7b13d8842...
Committed by dleffler
- A external/editors/tinymce/skins/lightgray/fonts/tinymce-small.dev.svg
- A external/editors/tinymce/skins/lightgray/fonts/tinymce.dev.svg
- M external/ExtPrograms.csv
- M external/editors/tinymce/plugins/importcss/plugin.min.js
- M external/editors/tinymce/plugins/lists/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/preview/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/tinymce.min.js
- M framework/core/subsystems/expRouter.php
- M framework/modules/administration/assets/css/slingbar.css
- M framework/modules/administration/views/administration/toolbar.bootstrap.tpl
- M framework/modules/navigation/assets/less/dropdown-bootstrap.less
- M framework/modules/navigation/views/navigation/showall_Flydown.bootstrap.tpl
- M framework/modules/navigation/views/navigation/showall_Flydown.bootstrap3.tpl
- M framework/modules/text/views/text/showall_inline.bootstrap.tpl
- M framework/modules/text/views/text/showall_inline.bootstrap3.tpl
- M framework/modules/text/views/text/showall_inline.tpl
- M index.php
- M themes/bootstrap3theme/class.php
- M themes/bootstrap3theme/config.php
- M themes/bootstrap3theme/index.php
- M themes/bootstrap3theme/modules/navigation/views/navigation/showall_Bootstrap Top
- M themes/bootstrap3theme/subthemes/Follow Parent.php
- M themes/bootstrap3theme/subthemes/Full Size.php
- M themes/bootstrap3theme/subthemes/Left Sectional.php
- M themes/bootstraptheme/class.php
- M themes/bootstraptheme/config.php
- M themes/bootstraptheme/index.php
- M themes/bootstraptheme/modules/navigation/views/navigation/showall_Bootstrap Top
- M themes/bootstraptheme/subthemes/Follow Parent.php
- M themes/bootstraptheme/subthemes/Full Size.php
- M themes/bootstraptheme/subthemes/Left Sectional.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