Changeset [5484a0cb992e98fe599787dee9025ef0ee483145] by dleffler
March 6th, 2014 @ 06:15 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/core/assets/css/accordion.css
framework/core/assets/css/admin-global.css
framework/core/assets/css/button.css
framework/core/assets/css/categories.css
framework/core/assets/css/clearfix.css
framework/core/assets/css/comments.css
framework/core/assets/css/common.css
framework/core/assets/css/forms-bootstrap.css
framework/core/assets/css/forms.css
framework/core/assets/css/forms2col.css
framework/core/assets/css/msgq.css
framework/core/assets/css/pagination.css
framework/core/assets/css/panel.css
framework/core/assets/css/panels.css
framework/core/assets/css/ratings.css
framework/core/assets/css/rerank.css
framework/core/assets/css/rerankpanel.css
framework/core/assets/css/tables.css
framework/core/assets/css/toggle.css
framework/core/assets/css/tree.css
framework/core/subsystems/expJavascript.php
themes/bootstraptheme/css/bootstrapcontrols.css
themes/bootstraptheme/css/bootstraptheme.css
https://github.com/exponentcms/exponent-cms/commit/5484a0cb992e98fe...
Committed by dleffler
- A framework/modules/file/connector/i18n/elfinder.cs.js
- A framework/modules/file/connector/i18n/elfinder.de.js
- A framework/modules/file/connector/i18n/elfinder.el.js
- A framework/modules/file/connector/i18n/elfinder.en.js
- A framework/modules/file/connector/i18n/elfinder.es.js
- A framework/modules/file/connector/i18n/elfinder.fr.js
- A framework/modules/file/connector/i18n/elfinder.no.js
- R framework/core/assets/css/accordion.css
- R framework/core/assets/css/admin-global.css
- R framework/core/assets/css/button.css
- R framework/core/assets/css/categories.css
- R framework/core/assets/css/clearfix.css
- R framework/core/assets/css/comments.css
- R framework/core/assets/css/common.css
- R framework/core/assets/css/forms-bootstrap.css
- R framework/core/assets/css/forms.css
- R framework/core/assets/css/forms2col.css
- R framework/core/assets/css/msgq.css
- R framework/core/assets/css/pagination.css
- R framework/core/assets/css/panel.css
- R framework/core/assets/css/panels.css
- R framework/core/assets/css/ratings.css
- R framework/core/assets/css/rerank.css
- R framework/core/assets/css/rerankpanel.css
- R framework/core/assets/css/tables.css
- R framework/core/assets/css/toggle.css
- R framework/core/assets/css/tree.css
- R themes/bootstraptheme/css/bootstrapcontrols.css
- R themes/bootstraptheme/css/bootstraptheme.css
- M external/ExtPrograms.csv
- M external/editors/ckeditor/plugins/fieldinsert/plugin.js
- M external/elFinder/js/elFinder.js
- M external/elFinder/js/elFinder.options.js
- M external/elFinder/js/i18n/elfinder.cs.js
- M external/elFinder/js/i18n/elfinder.de.js
- M external/elFinder/js/i18n/elfinder.el.js
- M external/elFinder/js/i18n/elfinder.en.js
- M external/elFinder/js/i18n/elfinder.es.js
- M external/elFinder/js/i18n/elfinder.fr.js
- M external/elFinder/js/i18n/elfinder.no.js
- M external/elFinder/php/elFinderVolumeLocalFileSystem.class.php
- M external/elFinder/php/elFinderVolumeS3.class.php
- M external/jquery/addons/css/jquery.colorbox.css
- M external/jquery/addons/css/spectrum.css
- M external/jquery/addons/js/jquery.colorbox.js
- M external/jquery/addons/js/spectrum.js
- M framework/core/forms/controls/ckeditorcontrol.php
- M framework/core/forms/controls/tinymcecontrol.php
- M framework/core/subsystems/expJavascript.php
- M framework/core/subsystems/expUtil.php
- M framework/modules/file/connector/elFinder.js
- M framework/modules/file/connector/elFinder.options.js
- M framework/modules/file/views/file/elfinder.tpl
- M themes/bootstraptheme/editors/ckeditor/ckeditor.css
- M themes/bootstraptheme/editors/tinymce/tinymce.css
- M themes/simpletheme/editors/tinymce/tinymce.css
- M themes/simpletheme/editors/tinymce/tinymce_Fall.css
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