Changeset [2850771fbd2281cf435bbf774dedc4178d2f82ba] by dleffler
January 6th, 2014 @ 09:05 PM
Merge branch 'develop' into revisions
Conflicts:
framework/core/subsystems/expCore.php
https://github.com/exponentcms/exponent-cms/commit/2850771fbd2281cf...
Committed by dleffler
- A framework/modules/photoalbum/views/photo/configure/slideshow.bootstrap.config
- A framework/modules/photoalbum/views/photo/slideshow.bootstrap.tpl
- M framework/core/assets/less/common.less
- M framework/core/assets/less/forms-bootstrap.less
- M framework/core/forms/controls/bootstrap/buttongroupcontrol.php
- M framework/core/forms/controls/bootstrap/checkboxcontrol.php
- M framework/core/forms/controls/bootstrap/filemanagercontrol.php
- M framework/core/forms/controls/calendarcontrol.php
- M framework/core/forms/controls/datetimecontrol.php
- M framework/core/forms/controls/tagtreecontrol.php
- M framework/core/forms/fakeform.php
- M framework/core/forms/form.php
- M framework/core/subsystems/expCore.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/ecommerce/views/store/show.tpl
- M framework/modules/events/views/event/configure/pull_google.bootstrap.tpl
- M framework/modules/events/views/event/configure/pull_ical.bootstrap.tpl
- M framework/modules/flickrfeed/views/flickrfeed/configure/rss_pull.bootstrap.tpl
- M framework/modules/news/views/news/configure/rss_pull.bootstrap.tpl
- M framework/modules/photoalbum/assets/css/yui3-slideshow.css
- M framework/modules/text/views/text/showall_inline.bootstrap.tpl
- M framework/plugins/block.form.php
- M framework/plugins/bootstrap/function.ddrerank.php
- M framework/plugins/bootstrap/function.export_pdf_link.php
- M framework/plugins/bootstrap/function.icon.php
- M framework/plugins/bootstrap/function.printer_friendly_link.php
- M framework/plugins/function.button_style.php
- M themes/bootstraptheme/class.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