Changeset: Changeset [b7f128e53c89a8a1e5f6e171fbae8b3344ee850f] by dleffler - Exponent CMS

Type	To find
responsible:me	tickets assigned to you
tagged:"@high"	tickets tagged @high
milestone:next	tickets in the upcoming milestone
state:invalid	tickets with the state invalid
created:"last week"	tickets created last week
sort:number, importance, updated	tickets sorted by #, importance or updated
Combine keywords for powerful searching.
Use advanced searching »

Changeset [b7f128e53c89a8a1e5f6e171fbae8b3344ee850f] by dleffler

January 6th, 2014 @ 09:13 PM

Merge branch 'develop' into bootstrap3dave

Conflicts:
framework/core/forms/fakeform.php framework/core/forms/form.php framework/plugins/block.form.php https://github.com/exponentcms/exponent-cms/commit/b7f128e53c89a8a1...

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/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/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

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

Bug Tracker for Exponent CMS