Changeset [bb399d2d4bcafd5f349d4a265642145bde8f0a54] by rasseljandavid

Revision bb399d2d4bcafd5f349d4a265642145bde8f0a54, committed by rasseljandavid · July 26th, 2011 @ 05:25 AM

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

204 changed files

A external/ExtPrograms.csv
A framework/modules/addressbook/sql/geo_countries.sql
A framework/modules/addressbook/sql/geo_regions.sql
A framework/modules/ecommerce/assets/sql/order_type_status_defaults.sql
R core_rss.php
M cron/bootstrap.php
M datatypes/calendar.php
M datatypes/calendarmodule_config.php
M datatypes/database_importer.php
M datatypes/file.php
M datatypes/file_collection.php
M datatypes/formbuilder_form.php
M datatypes/formbuilder_report.php
M datatypes/poll_answer.php
M datatypes/poll_question.php
M datatypes/rssfeed.php
M datatypes/section.php
M datatypes/section_template.php
M datatypes/simplepollmodule_config.php
M exponent.js.php
M exponent.php
M exponent_bootstrap.php
M framework/core/datatypes/expFile.php
M framework/core/datatypes/expRss.php
M framework/core/subsystems/expJavascript.php
M framework/core/subsystems/expLang.php
M framework/core/subsystems/expMail.php
M framework/core/subsystems/expValidator.php
M framework/datatypes/keywords.php
M framework/modules/administration/controllers/administrationController.php
M framework/modules/ecommerce/assets/css/storefront.css
M framework/modules/ecommerce/billingcalculators/cash.php
M framework/modules/ecommerce/billingcalculators/passthru.php
M framework/modules/ecommerce/controllers/ecomconfigController.php
M framework/modules/ecommerce/controllers/storeController.php
M framework/modules/ecommerce/products/datatypes/product.php
M framework/modules/ecommerce/shippingcalculators/fedexcalculator.php
M framework/modules/ecommerce/shippingcalculators/upscalculator.php
M framework/modules/ecommerce/views/order/create_new_order.tpl
M framework/modules/ecommerce/views/store/show.tpl
M framework/modules/ecommerce/views/store/showall.tpl
M framework/modules/motd/controllers/motdController.php
M framework/modules/users/controllers/usersController.php
M index.php
M install/upgrades/version_tracking.php
M login.php
M modules/administrationmodule/actions/config_activate.php
M modules/administrationmodule/actions/config_configuresite.php
M modules/administrationmodule/actions/config_delete.php
M modules/administrationmodule/actions/config_save.php
M modules/administrationmodule/actions/configuresite.php
M modules/administrationmodule/actions/finish_install_extension.php
M modules/administrationmodule/actions/gmgr_delete.php
M modules/administrationmodule/actions/gmgr_editprofile.php
M modules/administrationmodule/actions/gmgr_membership.php
M modules/administrationmodule/actions/gmgr_savegroup.php
M modules/administrationmodule/actions/groupaccounts.php
M modules/administrationmodule/actions/install_extension.php
M modules/administrationmodule/actions/installtables.php
M modules/administrationmodule/actions/managemodules.php
M modules/administrationmodule/actions/managesubsystems.php
M modules/administrationmodule/actions/managethemes.php
M modules/administrationmodule/actions/modmgr_activate.php
M modules/administrationmodule/actions/profileext_clear.php
M modules/administrationmodule/actions/profileext_manage.php
M modules/administrationmodule/actions/run.php
M modules/administrationmodule/actions/switchtheme.php
M modules/administrationmodule/actions/sysinfo.php
M modules/administrationmodule/actions/sysinfo_download.php
M modules/administrationmodule/actions/toggle_dev.php
M modules/administrationmodule/actions/toggle_maintenance.php
M modules/administrationmodule/actions/umgr_clearpass.php
M modules/administrationmodule/actions/umgr_delete.php
M modules/administrationmodule/actions/umgr_edit.php
M modules/administrationmodule/actions/umgr_editprofile.php
M modules/administrationmodule/actions/umgr_lockuser.php
M modules/administrationmodule/actions/umgr_membership.php
M modules/administrationmodule/actions/umgr_saveuser.php
M modules/administrationmodule/actions/upload_extension.php
M modules/administrationmodule/actions/useraccounts.php
M modules/administrationmodule/actions/usersessions.php
M modules/administrationmodule/actions/verify_extension.php
M modules/calendarmodule/actions/delete_all_past.php
M modules/calendarmodule/actions/delete_form.php
M modules/calendarmodule/actions/edit.php
M modules/calendarmodule/actions/ical.php
M modules/calendarmodule/actions/save.php
M modules/calendarmodule/actions/search.php
M modules/calendarmodule/actions/send_feedback.php
M modules/calendarmodule/actions/viewtag.php
M modules/calendarmodule/actions/viewweek.php
M modules/calendarmodule/class.php
M modules/common/actions/groupperms.php
M modules/common/actions/savegroupperms.php
M modules/common/actions/saveuserperms.php
M modules/common/actions/userperms.php
M modules/containermodule/class.php
M modules/exporter/auto.manifest.php
M modules/exporter/exporters/eql/savefile.php
M modules/exporter/exporters/files/export.php
M modules/formbuilder/actions/edit_control.php
M modules/formbuilder/actions/edit_record.php
M modules/formbuilder/actions/export_csv.php
M modules/formbuilder/actions/picked_source.php
M modules/formbuilder/actions/save_control.php
M modules/formbuilder/actions/save_form.php
M modules/formbuilder/actions/submit_form.php
M modules/formbuilder/actions/view_data.php
M modules/formbuilder/actions/view_form.php
M modules/formbuilder/actions/view_record.php
M modules/formmodule/class.php
M modules/importer/auto.manifest.php
M modules/importer/importers/eql/process.php
M modules/importer/importers/eql/start.php
M modules/importer/importers/files/extract.php
M modules/importer/importers/files/finish.php
M modules/importer/importers/files/process.php
M modules/importer/importers/files/start.php
M modules/importer/importers/usercsv/displayusers.php
M modules/importer/importers/usercsv/mapper.php
M modules/importer/importers/usercsv/process.php
M modules/importer/importers/usercsv/start.php
M modules/info/actions/showfiles.php
M modules/loginmodule/actions/login.php
M modules/loginmodule/actions/logout.php
M modules/loginmodule/actions/mygroups.php
M modules/loginmodule/actions/showuserprofile.php
M modules/navigationmodule/actions/save_pagesetpage.php
M modules/navigationmodule/nav.php
M modules/simplepollmodule/actions/manage_question.php
M modules/simplepollmodule/actions/results.php
M modules/simplepollmodule/actions/vote.php
M modules/simplepollmodule/class.php
M plugins/block.paginate.php
M plugins/function.attribution.php
M plugins/function.control.php
M plugins/function.exponent_sessions_get.php
M plugins/function.get_user.php
M plugins/function.object_to_js.php
M plugins/function.popupdatetimecontrol.php
M plugins/function.scaffold.php
M plugins/function.userlistcontrol.php
M plugins/function.yuilogger.php
M plugins/modifier.is_logged_in.php
M rss.php
M send_reminders.php
M site_rss.php
M subsystems/autoloader.php
M subsystems/backup.php
M subsystems/backup/0.95.php
M subsystems/backup/normalize.php
M subsystems/config.php
M subsystems/config/load.php
M subsystems/database/mysql.php
M subsystems/database/mysqli.php
M subsystems/database/mysqlid.php
M subsystems/database/postgres.php
M subsystems/forms/controls/EditorControl.php
M subsystems/forms/controls/antispamcontrol.php
M subsystems/forms/controls/autocompletecontrol.php
M subsystems/forms/controls/buttongroupcontrol.php
M subsystems/forms/controls/calendarcontrol.php
M subsystems/forms/controls/checkboxcontrol.php
M subsystems/forms/controls/ckeditorcontrol.php
M subsystems/forms/controls/configcontrol.php
M subsystems/forms/controls/contactcontrol.php
M subsystems/forms/controls/countryregioncontrol.php
M subsystems/forms/controls/customcontrol.php
M subsystems/forms/controls/datetimecontrol.php
M subsystems/forms/controls/dropdowncontrol.php
M subsystems/forms/controls/filemanagercontrol.php
M subsystems/forms/controls/genericcontrol.php
M subsystems/forms/controls/hiddenfieldcontrol.php
M subsystems/forms/controls/htmlcontrol.php
M subsystems/forms/controls/htmleditorcontrol.php
M subsystems/forms/controls/listbuildercontrol.php
M subsystems/forms/controls/listcontrol.php
M subsystems/forms/controls/massmailcontrol.php
M subsystems/forms/controls/monthyearcontrol.php
M subsystems/forms/controls/nextbackcontrol.php
M subsystems/forms/controls/passwordcontrol.php
M subsystems/forms/controls/popupdatetimecontrol.php
M subsystems/forms/controls/quantitycontrol.php
M subsystems/forms/controls/radiocontrol.php
M subsystems/forms/controls/radiogroupcontrol.php
M subsystems/forms/controls/textcontrol.php
M subsystems/forms/controls/texteditorcontrol.php
M subsystems/forms/controls/uploadcontrol.php
M subsystems/forms/controls/yuicalendarcontrol.php
M subsystems/forms/controls/yuidatetimecontrol.php
M subsystems/forms/controls/yuieditorcontrol.php
M subsystems/forms/fakeform.php
M subsystems/forms/form.php
M subsystems/geo.php
M subsystems/lang.auto.manifest.php
M subsystems/lang.php
M subsystems/mail.php
M subsystems/modules.php
M subsystems/smtp.php
M subsystems/template.php
M subsystems/users.php
M subsystems/users/profileextensions/bbextension.php
M subsystems/workflow.php
M thumb.php