Changeset [9a6d18e060bfd8247f644ff321e361aa6010e799] by dleffler
February 4th, 2014 @ 02:15 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/core/subsystems/expJavascript.php
https://github.com/exponentcms/exponent-cms/commit/9a6d18e060bfd824...
Committed by dleffler
- A framework/core/forms/controls/bootstrap/datetimecontrol.php
- M external/ExtPrograms.csv
- M external/editors/tinymce/plugins/paste/plugin.min.js
- M external/editors/tinymce/tinymce.min.js
- M external/elFinder/js/elFinder.js
- M external/elFinder/js/ui/cwd.js
- M external/elFinder/php/elFinderVolumeDriver.class.php
- M external/elFinder/php/elFinderVolumeDropbox.class.php
- M framework/core/forms/controls/bootstrap/yuicalendarcontrol.php
- M framework/core/forms/controls/bootstrap/yuidatetimecontrol.php
- M framework/core/subsystems/expCSS.php
- M framework/core/subsystems/expJavascript.php
- M framework/core/subsystems/expLang.php
- M framework/modules/events/views/event/month.tpl
- M framework/modules/file/connector/elFinder.js
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