Changeset [2aaa2b68c14c20d15864bd481c30b75083157f1c] by dleffler
January 4th, 2014 @ 04:46 AM
Merge branch 'develop' into bootstrap3dave
https://github.com/exponentcms/exponent-cms/commit/2aaa2b68c14c20d1...
Committed by dleffler
- A external/jquery/addons/css/images/border.png
- A external/jquery/addons/css/images/controls.png
- A external/jquery/addons/css/images/loading.gif
- A external/jquery/addons/css/images/loading_background.png
- A external/jquery/addons/css/jquery.colorbox.css
- A external/jquery/addons/css/jquery.uix.multiselect.css
- A external/jquery/addons/css/spectrum.css
- A external/jquery/addons/css/tag-it.css
- A external/jquery/addons/js/jquery.colorbox.js
- A external/jquery/addons/js/jquery.uix.multiselect.js
- A external/jquery/addons/js/locales/jquery.uix.multiselect_de.js
- A external/jquery/addons/js/locales/jquery.uix.multiselect_en.js
- A external/jquery/addons/js/locales/jquery.uix.multiselect_es.js
- A external/jquery/addons/js/locales/jquery.uix.multiselect_fr.js
- A external/jquery/addons/js/locales/jquery.uix.multiselect_it.js
- A external/jquery/addons/js/locales/jquery.uix.multiselect_nl.js
- A external/jquery/addons/js/locales/jquery.uix.multiselect_pt.js
- A external/jquery/addons/js/locales/jquery.uix.multiselect_ru.js
- A external/jquery/addons/js/locales/jquery.uix.multiselect_sv.js
- A external/jquery/addons/js/spectrum.js
- A external/jquery/addons/js/tag-it.js
- A external/jquery/js/ui/i18n/jquery-ui-i18n.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-af.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ar-DZ.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ar.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-az.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-be.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-bg.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-bs.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ca.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-cs.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-cy-GB.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-da.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-de.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-el.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-en-AU.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-en-GB.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-en-NZ.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-eo.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-es.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-et.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-eu.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-fa.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-fi.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-fo.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-fr-CA.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-fr-CH.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-fr.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-gl.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-he.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-hi.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-hr.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-hu.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-hy.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-id.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-is.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-it.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ja.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ka.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-kk.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-km.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ko.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ky.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-lb.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-lt.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-lv.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-mk.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ml.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ms.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-nb.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-nl-BE.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-nl.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-nn.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-no.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-pl.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-pt-BR.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-pt.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-rm.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ro.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ru.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-sk.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-sl.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-sq.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-sr-SR.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-sr.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-sv.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-ta.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-th.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-tj.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-tr.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-uk.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-vi.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-zh-CN.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-zh-HK.js
- A external/jquery/js/ui/i18n/jquery.ui.datepicker-zh-TW.js
- A framework/core/forms/controls/bootstrap/listbuildercontrol.php
- A framework/core/forms/controls/bootstrap/tagpickercontrol.php
- A reset.php
- R external/jquery/addons/css/colorpicker.css
- R external/jquery/addons/css/jquery.placeholder.min.css
- R external/jquery/addons/js/colorpicker.js
- R external/jquery/addons/js/jquery.placeholder.min.js
- R external/jquery/css/base/jquery-ui.css
- R external/jquery/css/black-tie/jquery-ui.css
- R external/jquery/css/blitzer/jquery-ui.css
- R external/jquery/css/cupertino/jquery-ui.css
- R external/jquery/css/dark-hive/jquery-ui.css
- R external/jquery/css/dot-luv/jquery-ui.css
- R external/jquery/css/eggplant/jquery-ui.css
- R external/jquery/css/excite-bike/jquery-ui.css
- R external/jquery/css/exponent/jquery-ui.css
- R external/jquery/css/flick/jquery-ui.css
- R external/jquery/css/hot-sneaks/jquery-ui.css
- R external/jquery/css/humanity/jquery-ui.css
- R external/jquery/css/le-frog/jquery-ui.css
- R external/jquery/css/mint-choc/jquery-ui.css
- R external/jquery/css/overcast/jquery-ui.css
- R external/jquery/css/pepper-grinder/jquery-ui.css
- R external/jquery/css/redmond/jquery-ui.css
- R external/jquery/css/smoothness/jquery-ui.css
- R external/jquery/css/south-street/jquery-ui.css
- R external/jquery/css/start/jquery-ui.css
- R external/jquery/css/sunny/jquery-ui.css
- R external/jquery/css/swanky-purse/jquery-ui.css
- R external/jquery/css/trontastic/jquery-ui.css
- R external/jquery/css/ui-darkness/jquery-ui.css
- R external/jquery/css/ui-lightness/jquery-ui.css
- R external/jquery/css/vader/jquery-ui.css
- R external/jquery/js/jquery-1.10.2.js
- R external/jquery/js/jquery-migrate-1.2.1.js
- R external/jquery/js/jquery-migrate-1.2.1.min.js
- R external/jquery/js/jquery-ui.js
- M CHANGELOG.md
- M external/ExtPrograms.csv
- M external/adminer/plugins/edit-calendar.php
- M external/html5forms/html5forms.fallback.js
- M framework/core/assets/less/forms-bootstrap.less
- M framework/core/expFramework.php
- M framework/core/forms/controls/calendarcontrol.php
- M framework/core/forms/controls/colorcontrol.php
- M framework/core/forms/controls/yuicalendarcontrol.php
- M framework/core/forms/controls/yuidatetimecontrol.php
- M framework/core/forms/fakeform.php
- M framework/core/forms/form.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/common/views/configure/module.tpl
- M framework/modules/core/views/expCat/edit.tpl
- M framework/modules/ecommerce/assets/js/expand_panels.js
- M framework/modules/ecommerce/assets/js/swatches.js
- M framework/modules/ecommerce/products/views/eventregistration/edit.tpl
- M framework/modules/ecommerce/views/eventregistration/month.tpl
- M framework/modules/ecommerce/views/store/month.tpl
- M framework/modules/events/views/event/_recurring.tpl
- M framework/modules/events/views/event/configure/event.tpl
- M framework/modules/events/views/event/configure/pull_google.bootstrap.tpl
- M framework/modules/events/views/event/configure/pull_google.tpl
- M framework/modules/events/views/event/configure/pull_ical.bootstrap.tpl
- M framework/modules/events/views/event/configure/pull_ical.tpl
- M framework/modules/events/views/event/month.tpl
- M framework/modules/events/views/event/show.tpl
- M framework/modules/file/assets/js/filemanager.js
- M framework/plugins/block.form.php
- M framework/plugins/function.br.php
- M framework/plugins/function.control.php
- M install/changes/2.2.4.txt
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