Changeset [26fa1bc131c600acf56c5e3721820d4b1c2aa24b] by Phillip Ball

April 27th, 2011 @ 06:08 AM

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

Committed by Phillip Ball

  • A framework/core/assets/images/manage.png
  • A framework/modules/links/views/links/configure/links.tpl
  • A framework/modules/snippet/views/snippet/configure/snippet.tpl
  • R framework/modules/links/views/links/configuration/links.tpl
  • R framework/modules/search/views/search/configuration/search.tpl
  • R framework/modules/snippet/views/snippet/cofigure/snippet.tpl
  • R modules/calendarmodule/views/Weekly.config
  • R modules/calendarmodule/views/Weekly.tpl
  • R modules/calendarmodule/views/_cat_viewCategories.tpl
  • M .gitignore
  • M forms/email/Contact Form.tpl
  • M forms/email/RSVP Form.tpl
  • M forms/email/_Contact Form.tpl
  • M forms/email/_RSVP Form.tpl
  • M framework/core/assets/css/admin-global.css
  • M framework/core/subsystems/expMail.php
  • M framework/modules/addressbook/views/address/myaddressbook.tpl
  • M framework/modules/administration/views/administration/manage_themes.tpl
  • M framework/modules/administration/views/administration/manage_unused_tables.tpl
  • M framework/modules/administration/views/administration/quicklinks_Administration_Links.tpl
  • M framework/modules/administration/views/administration/quicklinks_Developer_Links.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/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/blog.tpl
  • M framework/modules/blog/views/blog/configure/showall_headlines.config
  • M framework/modules/blog/views/blog/dates.tpl
  • 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/blog/views/blog/tags_cloud.tpl
  • M framework/modules/blog/views/blog/tags_list.tpl
  • M framework/modules/common/views/common/pagination_links.tpl
  • M framework/modules/common/views/common/pagination_table.tpl
  • M framework/modules/common/views/configure/aggregation.tpl
  • M framework/modules/common/views/configure/comments.tpl
  • M framework/modules/common/views/configure/files.tpl
  • M framework/modules/common/views/configure/rss.tpl
  • M framework/modules/common/views/configure/tags.tpl
  • M framework/modules/common/views/file/Downloadable Files.tpl
  • M framework/modules/common/views/file/configure/Downloadable Files.tpl
  • M framework/modules/common/views/options/checkboxes.tpl
  • M framework/modules/common/views/options/dropdown.tpl
  • M framework/modules/common/views/scaffold/showByTags.tpl
  • M framework/modules/common/views/scaffold/showRandom.tpl
  • M framework/modules/common/views/scaffold/showall.tpl
  • M framework/modules/company/views/company/related.tpl
  • M framework/modules/company/views/company/show.tpl
  • M framework/modules/company/views/company/showall.tpl
  • M framework/modules/core/views/expComment/getComments.tpl
  • M framework/modules/core/views/expComment/manage.tpl
  • M framework/modules/core/views/expHTMLEditor/manage.tpl
  • M framework/modules/core/views/expModule/manage.tpl
  • M framework/modules/core/views/expSimpleNote/getNotes.tpl
  • M framework/modules/core/views/expSimpleNote/manage.tpl
  • M framework/modules/countdown/views/countdown/configure/countdown.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/billingcalculators/views/authorizedotnet/configure.tpl
  • M framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl
  • M framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl
  • M framework/modules/ecommerce/billingcalculators/views/splitcreditcard/configure.tpl
  • M framework/modules/ecommerce/products/views/donation/addToCart.tpl
  • M framework/modules/ecommerce/products/views/eventregistration/addToCart.tpl
  • M framework/modules/ecommerce/products/views/eventregistration/show.tpl
  • M framework/modules/ecommerce/products/views/eventregistration/storeListing.tpl
  • M framework/modules/ecommerce/products/views/giftcard/addToCart.tpl
  • M framework/modules/ecommerce/products/views/giftcard/storeListing.tpl
  • M framework/modules/ecommerce/products/views/product/addToCart.tpl
  • M framework/modules/ecommerce/products/views/product/storeListing.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/fedexcalculator/configure.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/flatratecalculator/configure.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/instorepickupcalculator/configure.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/tablebasedcalculator/configure.tpl
  • M framework/modules/ecommerce/shippingcalculators/views/upscalculator/configure.tpl
  • M framework/modules/ecommerce/views/billing/configure.tpl
  • M framework/modules/ecommerce/views/billing/manage.tpl
  • M framework/modules/ecommerce/views/cart/checkout.tpl
  • M framework/modules/ecommerce/views/cart/selectShippingMethods.tpl
  • M framework/modules/ecommerce/views/cart/show_quickpay_donation_cart.tpl
  • M framework/modules/ecommerce/views/cart/splitShipping.tpl
  • M framework/modules/ecommerce/views/donation/showall.tpl
  • M framework/modules/ecommerce/views/ecomconfig/configure.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/options.tpl
  • M framework/modules/ecommerce/views/eventregistration/showall.tpl
  • M framework/modules/ecommerce/views/order/ordersbyuser.tpl
  • M framework/modules/ecommerce/views/order/showall.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_status/manage.tpl
  • M framework/modules/ecommerce/views/order_status/manage_messages.tpl
  • M framework/modules/ecommerce/views/order_type/edit.tpl
  • M framework/modules/ecommerce/views/order_type/manage.tpl
  • M framework/modules/ecommerce/views/product_status/edit.tpl
  • M framework/modules/ecommerce/views/product_status/manage.tpl
  • M framework/modules/ecommerce/views/shipping/configure.tpl
  • M framework/modules/ecommerce/views/shipping/manage.tpl
  • M framework/modules/ecommerce/views/store/manage.tpl
  • M framework/modules/ecommerce/views/store/picktype.tpl
  • M framework/modules/ecommerce/views/store/quicklinks.tpl
  • M framework/modules/ecommerce/views/store/search_by_model.tpl
  • M framework/modules/ecommerce/views/store/show.tpl
  • M framework/modules/ecommerce/views/store/showall.tpl
  • M framework/modules/ecommerce/views/store/showallByManufacturer.tpl
  • M framework/modules/ecommerce/views/store/showallUncategorized.tpl
  • M framework/modules/ecommerce/views/store/upcoming_events.tpl
  • M framework/modules/faq/views/faq/ask_question.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/filedownloads/controllers/filedownloadController.php
  • 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/showall.tpl
  • M framework/modules/filedownloads/views/filedownload/showall_quick_download_with_description.tpl
  • M framework/modules/filedownloads/views/filedownload/tags.tpl
  • M framework/modules/flickrfeed/views/flickrfeed/configure/rss_pull.tpl
  • M framework/modules/flickrfeed/views/flickrfeed/showall.tpl
  • 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/show.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/links/controllers/linksController.php
  • 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/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/controllers/newsController.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/show.tpl
  • M framework/modules/news/views/news/showByTitle.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/views/photos/configure/showall.config
  • M framework/modules/photoalbum/views/photos/configure/showall_slideshow.config
  • 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/showall_slideshow.tpl
  • M framework/modules/photoalbum/views/photos/slideshow.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/showall.tpl
  • M framework/modules/portfolio/views/portfolio/slideshow.tpl
  • M framework/modules/portfolio/views/portfolio/tags_list.tpl
  • M framework/modules/recyclebin/views/recyclebin/show.tpl
  • M framework/modules/report/views/report/generateProductReport.tpl
  • M framework/modules/report/views/report/generate_report.tpl
  • M framework/modules/rss/views/rss/showall.tpl
  • M framework/modules/search/views/search/configure/search.tpl
  • M framework/modules/search/views/search/search.tpl
  • M framework/modules/search/views/search/spider.tpl
  • M framework/modules/snippet/views/snippet/showall.tpl
  • M framework/modules/text/views/text/edit.tpl
  • M framework/modules/text/views/text/showRandom.tpl
  • M framework/modules/text/views/text/showall.tpl
  • M framework/modules/text/views/text/showall_tabview.tpl
  • M framework/modules/text/views/text/single.tpl
  • M framework/modules/twitter/views/twitter/showall.tpl
  • M framework/modules/users/controllers/usersController.php
  • M framework/modules/users/views/extensions/user_avatar.tpl
  • M framework/modules/users/views/extensions/user_bio.tpl
  • M framework/modules/users/views/extensions/user_instant_messenger.tpl
  • M framework/modules/users/views/users/change_password.tpl
  • M framework/modules/users/views/users/edit_group.tpl
  • M framework/modules/users/views/users/edit_userpassword.tpl
  • M framework/modules/users/views/users/edituser.tpl
  • M framework/modules/users/views/users/manage.tpl
  • M framework/modules/users/views/users/manage_extensions.tpl
  • M framework/modules/users/views/users/manage_group_memberships.tpl
  • M framework/modules/users/views/users/manage_groups.tpl
  • M framework/modules/users/views/users/manage_sessions.tpl
  • M framework/modules/users/views/users/password_reset_email.tpl
  • M framework/modules/users/views/users/reset_password.tpl
  • M framework/modules/youtube/views/youtube/configure/youtube.tpl
  • M framework/modules/youtube/views/youtube/showall.tpl
  • M modules/administrationmodule/views/Default.tpl
  • M modules/administrationmodule/views/Quick Links.tpl
  • M modules/administrationmodule/views/_config_configuresite.tpl
  • M modules/administrationmodule/views/_config_results.tpl
  • M modules/administrationmodule/views/_configuresiteview.tpl
  • M modules/administrationmodule/views/_examplecontent.tpl
  • M modules/administrationmodule/views/_form_massmail.tpl
  • M modules/administrationmodule/views/_form_uploadExt.tpl
  • M modules/administrationmodule/views/_gmgr_editprofile.tpl
  • M modules/administrationmodule/views/_groupmanager.tpl
  • M modules/administrationmodule/views/_groupmembership.tpl
  • M modules/administrationmodule/views/_htmlareaconfigs.tpl
  • M modules/administrationmodule/views/_modulemanager.tpl
  • M modules/administrationmodule/views/_optimizedatabase.tpl
  • M modules/administrationmodule/views/_orphanedcontent.tpl
  • M modules/administrationmodule/views/_panel.tpl
  • M modules/administrationmodule/views/_profileextManager.tpl
  • M modules/administrationmodule/views/_remove_css.tpl
  • M modules/administrationmodule/views/_sessionmanager.tpl
  • M modules/administrationmodule/views/_subsystemManager.tpl
  • M modules/administrationmodule/views/_sysinfo.tpl
  • M modules/administrationmodule/views/_tableInstallSummary.tpl
  • M modules/administrationmodule/views/_tableTrimSummary.tpl
  • M modules/administrationmodule/views/_thememanager.tpl
  • M modules/administrationmodule/views/_trimdatabaseWhich.tpl
  • M modules/administrationmodule/views/_umgr_edit_which.tpl
  • M modules/administrationmodule/views/_umgr_editprofile.tpl
  • M modules/administrationmodule/views/_upload_filesList.tpl
  • M modules/administrationmodule/views/_upload_finalSummary.tpl
  • M modules/administrationmodule/views/_usermanager.tpl
  • M modules/administrationmodule/views/_usermembership.tpl
  • M modules/bots/views/_bot_manager.tpl
  • M modules/calendarmodule/actions/edit.php
  • M modules/calendarmodule/assets/css/calendar.css
  • M modules/calendarmodule/views/Administration.tpl
  • M modules/calendarmodule/views/Default.tpl
  • M modules/calendarmodule/views/Featured Events.tpl
  • M modules/calendarmodule/views/List.tpl
  • M modules/calendarmodule/views/Mini-Calendar.tpl
  • M modules/calendarmodule/views/Monthly List.tpl
  • M modules/calendarmodule/views/Monthly Summary.tpl
  • M modules/calendarmodule/views/Past Events.tpl
  • M modules/calendarmodule/views/Upcoming Events - Headlines.tpl
  • M modules/calendarmodule/views/Upcoming Events.tpl
  • M modules/calendarmodule/views/_feedback_submitted.tpl
  • M modules/calendarmodule/views/_form_delete.tpl
  • M modules/calendarmodule/views/_form_edit.tpl
  • M modules/calendarmodule/views/_recur_dates.tpl
  • M modules/calendarmodule/views/_search.tpl
  • M modules/calendarmodule/views/_view.tpl
  • M modules/calendarmodule/views/_viewday.tpl
  • M modules/calendarmodule/views/_viewtag.tpl
  • M modules/calendarmodule/views/_viewweek.tpl
  • M modules/calendarmodule/views/_workflowview.tpl
  • M modules/common/views/_configure.tpl
  • M modules/common/views/_grouppermissions.tpl
  • M modules/common/views/_msg_queue.tpl
  • M modules/common/views/_permissions.tpl
  • M modules/common/views/_userpermissions.tpl
  • M modules/containermodule/views/_contentPicker.tpl
  • M modules/containermodule/views/_form_edit.tpl
  • M modules/containermodule/views/_lastreferencedelete.tpl
  • M modules/containermodule/views/_linkPicker.tpl
  • M modules/containermodule/views/_nocontent.tpl
  • M modules/containermodule/views/_orphans_modules.tpl
  • M modules/containermodule/views/_popup_info.tpl
  • M modules/containermodule/views/_view_clipboard.tpl
  • M modules/exporter/views/_eql_tableList.tpl
  • M modules/exporter/views/_exporters.tpl
  • M modules/exporter/views/_files_modList.tpl
  • M modules/formbuilder/actions/submit_form.php
  • M modules/formbuilder/views/_confirm_form.tpl
  • M modules/formbuilder/views/_custom_report.tpl
  • M modules/formbuilder/views/_data_view.tpl
  • M modules/formbuilder/views/_default_report.tpl
  • M modules/formbuilder/views/_view_form.tpl
  • M modules/formbuilder/views/_view_response.tpl
  • M modules/formmodule/views/Default.tpl
  • M modules/importer/views/_eql_restoreForm.tpl
  • M modules/importer/views/_eql_results.tpl
  • M modules/importer/views/_files_final.tpl
  • M modules/importer/views/_files_selectModList.tpl
  • M modules/importer/views/_files_uploadForm.tpl
  • M modules/importer/views/_files_verifyFiles.tpl
  • M modules/importer/views/_importers.tpl
  • M modules/importer/views/_usercsv_display_users.tpl
  • M modules/importer/views/_usercsv_form_geninfo.tpl
  • M modules/importer/views/_usercsv_form_mapping.tpl
  • M modules/importer/views/_usercsv_form_start.tpl
  • M modules/info/views/_checksums.tpl
  • M modules/loginmodule/views/Expanded.tpl
  • M modules/loginmodule/views/Logout Only.tpl
  • M modules/loginmodule/views/Stacked.tpl
  • M modules/loginmodule/views/_login_redirect.tpl
  • M modules/loginmodule/views/_show_userprofile.tpl
  • M modules/navigationmodule/views/Breadcrumb.tpl
  • M modules/navigationmodule/views/Children Only.tpl
  • M modules/navigationmodule/views/Children and Grandchildren.tpl
  • M modules/navigationmodule/views/Collapsing Hierarchy.tpl
  • M modules/navigationmodule/views/Directional.tpl
  • M modules/navigationmodule/views/Expanding Hierarchy - Children Only.tpl
  • M modules/navigationmodule/views/Expanding Hierarchy.tpl
  • M modules/navigationmodule/views/Full Hierarchy.tpl
  • M modules/navigationmodule/views/Manage.tpl
  • M modules/navigationmodule/views/Marked Hierarchy.tpl
  • M modules/navigationmodule/views/Siblings Only.tpl
  • M modules/navigationmodule/views/Siblings and Children.tpl
  • M modules/navigationmodule/views/Site Map.tpl
  • M modules/navigationmodule/views/Top Down Collapsing.tpl
  • M modules/navigationmodule/views/Top Nav.tpl
  • M modules/navigationmodule/views/YUI Side Nav JS.tpl
  • M modules/navigationmodule/views/YUI Side Nav.tpl
  • M modules/navigationmodule/views/YUI Top Nav JS.tpl
  • M modules/navigationmodule/views/YUI Top Nav.tpl
  • M modules/navigationmodule/views/You Are Here.tpl
  • M modules/navigationmodule/views/_add_whichtype.tpl
  • M modules/navigationmodule/views/_form_addPagesetPage.tpl
  • M modules/navigationmodule/views/_form_editContentPage.tpl
  • M modules/navigationmodule/views/_form_editExternalAlias.tpl
  • M modules/navigationmodule/views/_form_editInternalAlias.tpl
  • M modules/navigationmodule/views/_form_editProperties.tpl
  • M modules/navigationmodule/views/_form_editTemplate.tpl
  • M modules/navigationmodule/views/_htmleditor.tpl
  • M modules/navigationmodule/views/_linker.tpl
  • M modules/navigationmodule/views/_manager.tpl
  • M modules/navigationmodule/views/_manager_hierarchy.tpl
  • M modules/navigationmodule/views/_manager_pagesets.tpl
  • M modules/navigationmodule/views/_manager_standalone.tpl
  • M modules/navigationmodule/views/_move_standalone.tpl
  • M modules/navigationmodule/views/_view_template.tpl
  • M modules/previewmodule/views/Default.tpl
  • M modules/simplepollmodule/views/Default.tpl
  • M modules/simplepollmodule/views/_editAnswer.tpl
  • M modules/simplepollmodule/views/_editQuestion.tpl
  • M modules/simplepollmodule/views/_manageQuestion.tpl
  • M modules/simplepollmodule/views/_manageQuestions.tpl
  • M modules/simplepollmodule/views/_results.tpl
  • M subsystems/forms/controls/ckeditorcontrol.php
  • M subsystems/forms/js/alphanum_filter.js
  • M subsystems/forms/js/decimal_filter.js
  • M subsystems/forms/js/integer_filter.js
  • M subsystems/forms/js/money_filter.js
  • M subsystems/forms/js/percent_filter.js
  • M subsystems/forms/js/required.js
  • M themes/coolwatertheme/modules/navigationmodule/views/YUI Top Nav.tpl
  • M themes/retrotheme/modules/navigationmodule/views/Children Only.tpl
  • M views/orphaned_content.tpl
  • M views/popup_general.tpl
  • M views/popup_printerfriendly.tpl
  • M views/viewnotfound.tpl
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