Changeset [d736c6f9c3f578ec42db1b00b854c4b4ebe9469c] by rasseljandavid
November 14th, 2011 @ 01:27 PM
Merge remote-tracking branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/d736c6f9c3f578ec...
Committed by rasseljandavid
- A cron/lang_extract.php
- A cron/lang_update.php
- A external/BingTranslate.class.php
- A external/flowplayer3/flowplayer.controls-air-3.2.5.swf
- A external/flowplayer3/flowplayer.controls-tube-3.2.5.swf
- A framework/core/lang/Deutsch.info.php
- A framework/core/lang/Deutsch.php
- A framework/modules-1/calendarmodule/forms/calendar/Contact Form.tpl
- A framework/modules-1/calendarmodule/forms/calendar/RSVP Form.tpl
- A framework/modules-1/calendarmodule/forms/calendar/_Contact Form.tpl
- A framework/modules-1/calendarmodule/forms/calendar/_RSVP Form.tpl
- A framework/modules-1/calendarmodule/forms/calendar/_recurring.tpl
- A framework/modules/addressbook/views/address/configure/address.tpl
- A framework/modules/administration/views/administration/manage_lang_await.tpl
- R framework/modules-1/calendarmodule/forms/email/Contact Form.tpl
- R framework/modules-1/calendarmodule/forms/email/RSVP Form.tpl
- R framework/modules-1/calendarmodule/forms/email/_Contact Form.tpl
- R framework/modules-1/calendarmodule/forms/email/_RSVP Form.tpl
- R framework/modules-1/calendarmodule/form.part
- M cron/send_reminders.php
- M exponent_constants.php
- M external/ExtPrograms.csv
- M framework/core/lang/English - US.php
- M framework/core/lang/Espa?ol.php
- M framework/core/models-1/calendar.php
- M framework/core/subsystems/expCore.php
- M framework/core/subsystems/expJavascript.php
- M framework/core/subsystems/expLang.php
- M framework/core/subsystems/forms/controls/autocompletecontrol.php
- M framework/core/subsystems/forms/controls/filemanagercontrol.php
- M framework/core/subsystems/forms/controls/genericcontrol.php
- M framework/core/subsystems/forms/controls/listcontrol.php
- M framework/core/subsystems/forms/controls/yuieditorcontrol.php
- M framework/core/views/viewnotfound.tpl
- M framework/modules-1/bots/views/_bot_manager.tpl
- M framework/modules-1/calendarmodule/actions/edit.php
- M framework/modules-1/calendarmodule/actions/send_feedback.php
- M framework/modules-1/calendarmodule/actions/view.php
- M framework/modules-1/calendarmodule/views/Upcoming Events.tpl
- M framework/modules-1/calendarmodule/views/_reminder.tpl
- M framework/modules-1/common/views/_msg_queue.tpl
- M framework/modules-1/containermodule/views/Default.tpl
- M framework/modules-1/containermodule/views/Tabbed.tpl
- M framework/modules-1/containermodule/views/_addmodulelink.tpl
- M framework/modules-1/containermodule/views/_lastreferencedelete.tpl
- M framework/modules-1/containermodule/views/_linkPicker.tpl
- M framework/modules-1/containermodule/views/_popup_info.tpl
- M framework/modules-1/containermodule/views/_view_clipboard.tpl
- M framework/modules-1/exporter/views/_eql_tableList.tpl
- M framework/modules-1/exporter/views/_files_modList.tpl
- M framework/modules-1/formbuilder/views/_confirm_form.tpl
- M framework/modules-1/importer/views/_files_final.tpl
- M framework/modules-1/navigationmodule/views/Children Only.tpl
- M framework/modules-1/navigationmodule/views/Directional.tpl
- M framework/modules-1/navigationmodule/views/Manage.tpl
- M framework/modules-1/navigationmodule/views/_form_editTemplate.tpl
- M framework/modules-1/simplepollmodule/views/Default.tpl
- M framework/modules-1/simplepollmodule/views/_editAnswer.tpl
- M framework/modules-1/simplepollmodule/views/_editQuestion.tpl
- M framework/modules-1/simplepollmodule/views/_manageQuestion.tpl
- M framework/modules-1/simplepollmodule/views/_manageQuestions.tpl
- M framework/modules/addressbook/views/address/edit.tpl
- M framework/modules/addressbook/views/address/manage.tpl
- M framework/modules/addressbook/views/address/myaddressbook.tpl
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/administration/views/administration/manage_lang.tpl
- M framework/modules/administration/views/administration/manage_unused_tables.tpl
- M framework/modules/banners/views/banner/configure/banner_settings.tpl
- M framework/modules/banners/views/banner/configure/banners_to_show.tpl
- M framework/modules/banners/views/banner/configure/default_banner.tpl
- M framework/modules/banners/views/banner/edit.tpl
- M framework/modules/banners/views/banner/manage.tpl
- M framework/modules/banners/views/banner/showall.tpl
- M framework/modules/banners/views/banner/showall_two_per_row.tpl
- M framework/modules/blog/controllers/blogController.php
- M framework/modules/blog/views/blog/authors.tpl
- M framework/modules/blog/views/blog/configure/aggregation.tpl
- M framework/modules/blog/views/blog/configure/blog.tpl
- M framework/modules/blog/views/blog/configure/showall_headlines.config
- M framework/modules/blog/views/blog/edit.tpl
- M framework/modules/blog/views/blog/show.tpl
- M framework/modules/blog/views/blog/showall.tpl
- M framework/modules/blog/views/blog/showall_headlines.tpl
- M framework/modules/company/views/company/edit.tpl
- M framework/modules/company/views/company/show.tpl
- M framework/modules/company/views/company/showall.tpl
- M framework/modules/core/views/expModule/manage.tpl
- M framework/modules/countdown/views/countdown/configure/countdown.tpl
- M framework/modules/countdown/views/countdown/edit.tpl
- M framework/modules/countdown/views/countdown/show.tpl
- M framework/modules/ealerts/views/ealert/configuration/Ealert.tpl
- M framework/modules/ealerts/views/ealert/confirm.tpl
- M framework/modules/ealerts/views/ealert/confirmation_email.tpl
- M framework/modules/ealerts/views/ealert/pending.tpl
- M framework/modules/ealerts/views/ealert/send_confirm.tpl
- M framework/modules/ealerts/views/ealert/showall.tpl
- M framework/modules/ealerts/views/ealert/subscriptions.tpl
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/products/views/donation/edit.tpl
- M framework/modules/ecommerce/products/views/eventregistration/edit.tpl
- M framework/modules/ecommerce/products/views/giftcard/addToCart.tpl
- M framework/modules/ecommerce/products/views/giftcard/edit.tpl
- M framework/modules/ecommerce/products/views/product/addToCart.tpl
- M framework/modules/ecommerce/products/views/product/addToOrder.tpl
- M framework/modules/ecommerce/products/views/product/cartSummary.tpl
- M framework/modules/ecommerce/products/views/product/child_edit.tpl
- M framework/modules/ecommerce/products/views/product/edit.tpl
- M framework/modules/ecommerce/views/billing/configure.tpl
- M framework/modules/ecommerce/views/cart/address.tpl
- M framework/modules/ecommerce/views/cart/checkout.tpl
- M framework/modules/ecommerce/views/cart/configure.tpl
- M framework/modules/ecommerce/views/cart/createaddress.tpl
- M framework/modules/ecommerce/views/cart/quickPay.tpl
- M framework/modules/ecommerce/views/cart/selectShippingMethods.tpl
- M framework/modules/ecommerce/views/cart/show.tpl
- M framework/modules/ecommerce/views/cart/splitShipping.tpl
- M framework/modules/ecommerce/views/ecomconfig/configure.tpl
- M framework/modules/ecommerce/views/ecomconfig/edit_option_master.tpl
- M framework/modules/ecommerce/views/ecomconfig/edit_optiongroup_master.tpl
- M framework/modules/ecommerce/views/ecomconfig/manage_discounts.tpl
- M framework/modules/ecommerce/views/ecomconfig/manage_groupdiscounts.tpl
- M framework/modules/ecommerce/views/ecomconfig/manage_promocodes.tpl
- M framework/modules/ecommerce/views/ecomconfig/manage_upcharge.tpl
- M framework/modules/ecommerce/views/order/createReferenceOrder.tpl
- M framework/modules/ecommerce/views/order/edit_address.tpl
- M framework/modules/ecommerce/views/order/edit_billing_address.tpl
- M framework/modules/ecommerce/views/order/edit_invoice_id.tpl
- M framework/modules/ecommerce/views/order/edit_order_item.tpl
- M framework/modules/ecommerce/views/order/edit_payment_info.tpl
- M framework/modules/ecommerce/views/order/edit_shipping_method.tpl
- M framework/modules/ecommerce/views/order/edit_totals.tpl
- M framework/modules/ecommerce/views/order/email_invoice.tpl
- M framework/modules/ecommerce/views/order/invoice.tpl
- M framework/modules/ecommerce/views/order/show.tpl
- M framework/modules/ecommerce/views/order/verifyReturnShopper.tpl
- M framework/modules/ecommerce/views/order_status/edit.tpl
- M framework/modules/ecommerce/views/order_status/edit_message.tpl
- M framework/modules/ecommerce/views/order_type/edit.tpl
- M framework/modules/ecommerce/views/product_status/edit.tpl
- M framework/modules/ecommerce/views/purchaseOrder/edit_vendor.tpl
- M framework/modules/ecommerce/views/sales_rep/edit.tpl
- M framework/modules/ecommerce/views/shipping/configure.tpl
- M framework/modules/ecommerce/views/shipping/editspeed.tpl
- M framework/modules/ecommerce/views/store/batch_process.tpl
- M framework/modules/ecommerce/views/store/edit_images.tpl
- M framework/modules/ecommerce/views/store/edit_model_alias.tpl
- M framework/modules/ecommerce/views/store/edit_quantity.tpl
- M framework/modules/ecommerce/views/store/import_external_addresses.tpl
- M framework/modules/ecommerce/views/store/picktype.tpl
- M framework/modules/ecommerce/views/store/processModelAliases.tpl
- M framework/modules/ecommerce/views/store/search_by_model_form.tpl
- M framework/modules/ecommerce/views/store/show.tpl
- M framework/modules/ecommerce/views/store/uploadModelAliases.tpl
- M framework/modules/ecommerce/views/storeCategory/edit.tpl
- M framework/modules/ecommerce/views/tax/edit.tpl
- M framework/modules/ecommerce/views/tax/edit_zone.tpl
- M framework/modules/faq/views/faq/ask_question.tpl
- M framework/modules/faq/views/faq/configure/FAQ.tpl
- M framework/modules/faq/views/faq/configure/FAQ_Email.tpl
- M framework/modules/faq/views/faq/edit.tpl
- M framework/modules/faq/views/faq/edit_answer.tpl
- M framework/modules/faq/views/faq/manage.tpl
- M framework/modules/faq/views/faq/showall.tpl
- M framework/modules/file/views/file/picker_cke.tpl
- M framework/modules/file/views/file/uploader.tpl
- M framework/modules/filedownloads/views/filedownload/configure/file_downloads.tpl
- M framework/modules/filedownloads/views/filedownload/configure/podcast.tpl
- M framework/modules/filedownloads/views/filedownload/edit.tpl
- M framework/modules/filedownloads/views/filedownload/show.tpl
- M framework/modules/filedownloads/views/filedownload/showall.tpl
- M framework/modules/flickrfeed/views/flickrfeed/configure/rss_pull.tpl
- M framework/modules/flowplayer/controllers/flowplayerController.php
- M framework/modules/flowplayer/views/flowplayer/configure/video.tpl
- M framework/modules/flowplayer/views/flowplayer/edit.tpl
- M framework/modules/flowplayer/views/flowplayer/showall.tpl
- M framework/modules/flowplayer/views/flowplayer/showall_playlist.tpl
- M framework/modules/headline/views/headline/configure/configure.tpl
- M framework/modules/headline/views/headline/edit.tpl
- M framework/modules/headline/views/headline/show.tpl
- M framework/modules/help/views/help/configure/help.tpl
- M framework/modules/help/views/help/edit.tpl
- M framework/modules/help/views/help/edit_version.tpl
- M framework/modules/help/views/help/manage.tpl
- M framework/modules/help/views/help/manage_versions.tpl
- M framework/modules/help/views/help/show.tpl
- M framework/modules/help/views/help/showall.tpl
- M framework/modules/importexport/views/importexport/export.tpl
- M framework/modules/importexport/views/importexport/import.tpl
- M framework/modules/importexport/views/importexport/manage.tpl
- M framework/modules/links/views/links/configure/links.tpl
- M framework/modules/links/views/links/edit.tpl
- M framework/modules/links/views/links/showall.tpl
- M framework/modules/links/views/links/showall_quicklinks.tpl
- M framework/modules/migration/controllers/migrationController.php
- M framework/modules/migration/views/migration/configure.tpl
- M framework/modules/migration/views/migration/manage_content.tpl
- M framework/modules/migration/views/migration/manage_files.tpl
- M framework/modules/migration/views/migration/manage_pages.tpl
- M framework/modules/migration/views/migration/manage_users.tpl
- M framework/modules/migration/views/migration/migrate_content.tpl
- M framework/modules/migration/views/migration/migrate_files.tpl
- M framework/modules/motd/controllers/motdController.php
- M framework/modules/motd/views/motd/configure/MOTD.tpl
- M framework/modules/motd/views/motd/edit.tpl
- M framework/modules/motd/views/motd/show.tpl
- M framework/modules/motd/views/motd/showall.tpl
- M framework/modules/news/models/SimplePie.php
- M framework/modules/news/views/news/configure/news.tpl
- M framework/modules/news/views/news/configure/rss_pull.tpl
- M framework/modules/news/views/news/configure/showall_headlines.config
- M framework/modules/news/views/news/edit.tpl
- M framework/modules/news/views/news/show.tpl
- M framework/modules/news/views/news/showExpired.tpl
- M framework/modules/news/views/news/showUnpublished.tpl
- M framework/modules/news/views/news/showall.tpl
- M framework/modules/news/views/news/showall_headlines.tpl
- M framework/modules/notfound/views/notfound/page_not_found.tpl
- M framework/modules/photoalbum/assets/js/yui3-slideshow.js
- M framework/modules/photoalbum/views/photos/configure/gallery.tpl
- M framework/modules/photoalbum/views/photos/configure/slideshow.config
- M framework/modules/photoalbum/views/photos/edit.tpl
- M framework/modules/photoalbum/views/photos/show.tpl
- M framework/modules/photoalbum/views/photos/showall.tpl
- M framework/modules/photoalbum/views/photos/slideshow.tpl
- M framework/modules/pixidou/views/pixidou/editor.tpl
- M framework/modules/portfolio/views/portfolio/configure/portfolio.tpl
- M framework/modules/portfolio/views/portfolio/configure/slideshow.config
- M framework/modules/portfolio/views/portfolio/edit.tpl
- M framework/modules/portfolio/views/portfolio/show.tpl
- M framework/modules/portfolio/views/portfolio/showall.tpl
- M framework/modules/portfolio/views/portfolio/slideshow.tpl
- M framework/modules/recyclebin/models/recyclebin.php
- M framework/modules/report/views/report/abandoned_carts.tpl
- M framework/modules/report/views/report/dashboard.tpl
- M framework/modules/report/views/report/order_report.tpl
- M framework/modules/report/views/report/payment_report.tpl
- M framework/modules/report/views/report/product_report.tpl
- M framework/modules/report/views/report/show_payment_summary.tpl
- M framework/modules/rss/views/rss/showall.tpl
- M framework/modules/users/controllers/loginController.php
- M framework/modules/users/extensions/user_avatar.php
- M framework/modules/users/views/users/manage_groups.tpl
- M framework/plugins/block.css.php
- M framework/plugins/block.form.php
- M framework/plugins/block.if_elements.php
- M framework/plugins/block.paginate.php
- M framework/plugins/block.permissions.php
- M framework/plugins/block.pop.php
- M framework/plugins/block.script.php
- M framework/plugins/block.toggle.php
- M framework/plugins/function.assign_adv.php
- M framework/plugins/function.attribution.php
- M framework/plugins/function.backlink.php
- M framework/plugins/function.br.php
- M framework/plugins/function.chain.php
- M framework/plugins/function.clear.php
- M framework/plugins/function.comments.php
- M framework/plugins/function.control.php
- M framework/plugins/function.currency_symbol.php
- M framework/plugins/function.ddrerank.php
- M framework/plugins/function.edebug.php
- M framework/plugins/function.exponent_sessions_get.php
- M framework/plugins/function.filedisplayer.php
- M framework/plugins/function.fileuploadcontrol.php
- M framework/plugins/function.get_cart_summary.php
- M framework/plugins/function.get_favorites.php
- M framework/plugins/function.get_object.php
- M framework/plugins/function.get_user.php
- M framework/plugins/function.getchromemenu.php
- M framework/plugins/function.getfilename.php
- M framework/plugins/function.getnav.php
- M framework/plugins/function.gettext.php
- M framework/plugins/function.help.php
- M framework/plugins/function.icon.php
- M framework/plugins/function.img.php
- M framework/plugins/function.keybyid.php
- M framework/plugins/function.link.php
- M framework/plugins/function.makecase.php
- M framework/plugins/function.max_filesize.php
- M framework/plugins/function.messagequeue.php
- M framework/plugins/function.navtojson.php
- M framework/plugins/function.obj2json.php
- M framework/plugins/function.object_to_js.php
- M framework/plugins/function.optiondisplayer.php
- M framework/plugins/function.pagebacklink.php
- M framework/plugins/function.pagelinks.php
- M framework/plugins/function.pagenextlink.php
- M framework/plugins/function.pagenumbers.php
- M framework/plugins/function.plural.php
- M framework/plugins/function.podcastlink.php
- M framework/plugins/function.popupdatetimecontrol.php
- M framework/plugins/function.printer_friendly_link.php
- M framework/plugins/function.prod_images.php
- M framework/plugins/function.rating.php
- M framework/plugins/function.rsslink.php
- M framework/plugins/function.scaffold.php
- M framework/plugins/function.securelink.php
- M framework/plugins/function.selectobjects.php
- M framework/plugins/function.selectvalue.php
- M framework/plugins/function.showaction.php
- M framework/plugins/function.stars.php
- M framework/plugins/function.time_duration.php
- M framework/plugins/function.uniqueid.php
- M framework/plugins/function.userlistcontrol.php
- M framework/plugins/function.viewfile.php
- M framework/plugins/function.yuilogger.php
- M framework/plugins/function.yuimenu.php
- M framework/plugins/function.yuimenubar.php
- M framework/plugins/modifier.address.php
- M framework/plugins/modifier.array_lookup.php
- M framework/plugins/modifier.convertlangcode.php
- M framework/plugins/modifier.countryname.php
- M framework/plugins/modifier.expdate.php
- M framework/plugins/modifier.format_date.php
- M framework/plugins/modifier.format_tooltip.php
- M framework/plugins/modifier.groupname.php
- M framework/plugins/modifier.hide_email.php
- M framework/plugins/modifier.is_logged_in.php
- M framework/plugins/modifier.kilobytes.php
- M framework/plugins/modifier.nobreak.php
- M framework/plugins/modifier.number_format.php
- M framework/plugins/modifier.remove_space.php
- M framework/plugins/modifier.statename.php
- M framework/plugins/modifier.summarize.php
- M framework/plugins/modifier.urlencode.php
- M framework/plugins/postfilter.includemiscfiles.php
- M install/include/sanity.php
- M install/include/upgradescript.php
- M install/index.php
- M install/pages/final.php
- M install/pages/install-5.php
- M install/pages/install-7.php
- M install/pages/upgrade-1.php
- M install/pages/upgrade-2.php
- M install/pages/upgrade-3.php
- M install/pages/welcome.php
- M install/popup.php
- M install/popups/sanity.php
- M install/upgrades/fix_database.php
- M install/upgrades/version_tracking.php
- M selector.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