Changeset [f9c21aad20644ef9490a962c24e9d8e1d17a61af] by rasseljandavid

October 19th, 2011 @ 03:52 PM

Merge remote-tracking branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/f9c21aad20644ef9...

Committed by rasseljandavid

  • A themes/multioptionstheme/images/Logo.png
  • R themes/multioptionstheme/css/calendarmodule.css
  • R themes/multioptionstheme/css/textmodule.css
  • R themes/multioptionstheme/images/header.jpg
  • R themes/multioptionstheme/images/sample.jpg
  • M exponent.php
  • M framework/core/controllers/expHTMLEditorController.php
  • M framework/core/expFramework.php
  • M framework/core/subsystems/expHistory.php
  • M framework/core/subsystems/expTheme.php
  • M framework/core/subsystems/forms/controls/antispamcontrol.php
  • M framework/core/subsystems/forms/controls/buttongroupcontrol.php
  • M framework/core/subsystems/forms/controls/calendarcontrol.php
  • M framework/core/subsystems/forms/controls/checkboxcontrol.php
  • M framework/core/subsystems/forms/controls/configcontrol.php
  • M framework/core/subsystems/forms/controls/datetimecontrol.php
  • M framework/core/subsystems/forms/controls/dropdowncontrol.php
  • M framework/core/subsystems/forms/controls/filemanagercontrol.php
  • M framework/core/subsystems/forms/controls/genericcontrol.php
  • M framework/core/subsystems/forms/controls/hiddenfieldcontrol.php
  • M framework/core/subsystems/forms/controls/htmlcontrol.php
  • M framework/core/subsystems/forms/controls/listbuildercontrol.php
  • M framework/core/subsystems/forms/controls/listcontrol.php
  • M framework/core/subsystems/forms/controls/popupdatetimecontrol.php
  • M framework/core/subsystems/forms/controls/quantitycontrol.php
  • M framework/core/subsystems/forms/controls/radiocontrol.php
  • M framework/core/subsystems/forms/controls/radiogroupcontrol.php
  • M framework/core/subsystems/forms/controls/textcontrol.php
  • M framework/core/subsystems/forms/controls/texteditorcontrol.php
  • M framework/core/subsystems/forms/controls/uploadcontrol.php
  • M framework/core/subsystems/forms/controls/yuicalendarcontrol.php
  • M framework/core/subsystems/forms/controls/yuidatetimecontrol.php
  • M framework/core/subsystems/forms/controls/yuieditorcontrol.php
  • M framework/modules-1/bots/actions/manage_bots.php
  • M framework/modules-1/calendarmodule/actions/ical.php
  • M framework/modules-1/calendarmodule/actions/search.php
  • M framework/modules-1/calendarmodule/actions/view.php
  • M framework/modules-1/calendarmodule/actions/viewday.php
  • M framework/modules-1/calendarmodule/actions/viewmonth.php
  • M framework/modules-1/calendarmodule/actions/viewtag.php
  • M framework/modules-1/calendarmodule/actions/viewweek.php
  • M framework/modules-1/containermodule/views/Tabbed.tpl
  • M framework/modules-1/formbuilder/actions/edit_record.php
  • M framework/modules-1/formbuilder/actions/export_csv.php
  • M framework/modules-1/formbuilder/actions/order_controls.php
  • M framework/modules-1/formbuilder/actions/view_data.php
  • M framework/modules-1/formbuilder/actions/view_form.php
  • M framework/modules-1/formmodule/class.php
  • M framework/modules-1/navigationmodule/actions/manage.php
  • M framework/modules-1/navigationmodule/actions/manage_pagesets.php
  • M framework/modules-1/navigationmodule/actions/manage_standalone.php
  • M framework/modules-1/navigationmodule/actions/view_template.php
  • M framework/modules-1/simplepollmodule/actions/manage_question.php
  • M framework/modules-1/simplepollmodule/actions/manage_questions.php
  • M framework/modules/administration/controllers/administrationController.php
  • M framework/modules/core/views/expHTMLEditor/edit.tpl
  • M framework/modules/core/views/expHTMLEditor/manage.tpl
  • M framework/modules/core/views/expHTMLEditor/preview.tpl
  • M framework/modules/text/views/text/showall_tabview.tpl
  • M framework/modules/users/controllers/loginController.php
  • M framework/plugins/function.control.php
  • M popup.php
  • M selector.php
  • M themes/multioptionstheme/css/multi-options.css
New-ticket 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

Shared Ticket Bins