Changeset [e8a336838a9b531c8a529b12f1f77afdad1d4bd4] by dleffler
August 15th, 2013 @ 09:34 PM
Merge branch 'release/v2.2.2'
Conflicts:
framework/modules/events/controllers/eventController.php
framework/modules/navigation/controllers/navigationController.php
https://github.com/exponentcms/exponent-cms/commit/e8a336838a9b531c...
Committed by dleffler
- A external/facebook-php-sdk-3.2.2/changelog.md
- A external/facebook-php-sdk-3.2.2/readme.md
- A external/facebook-php-sdk-3.2.2/src/base_facebook.php
- A external/facebook-php-sdk-3.2.2/src/facebook.php
- A external/facebook-php-sdk-3.2.2/src/fb_ca_chain_bundle.crt
- A external/mediaelement/build/flashmediaelement-cdn.swf
- A framework/modules/ecommerce/products/models/childProduct.php
- A framework/modules/events/views/event/configure/facebook.tpl
- A framework/modules/events/views/event/configure/twitter.tpl
- A framework/modules/faq/views/faq/configure/showall_toggle.config
- A framework/modules/faq/views/faq/showall_toggle.tpl
- A framework/modules/help/views/help/showall_childview.tpl
- A framework/modules/help/views/help/showall_side_childview.tpl
- A framework/modules/help/views/help/showall_side_column.tpl
- A install/changes/2.2.2.txt
- R framework/modules/ecommerce/models/childProduct.php
- M .gitignore
- M CHANGELOG.md
- M cron/find_help.php
- M exponent_version.php
- M external/ExtPrograms.csv
- M external/SimpleAjaxUploader.js
- M external/iCalcreator.class.php
- M external/jquery/addons/js/jquery-ui-timepicker-addon.js
- M external/lessphp/README.md
- M external/lessphp/lessc.inc.php
- M external/mediaelement/README.md
- M external/mediaelement/build/flashmediaelement.swf
- M external/mediaelement/build/mediaelement-and-player.js
- M external/mediaelement/build/mediaelement-and-player.min.js
- M external/mediaelement/build/mediaelement.js
- M external/mediaelement/build/mediaelement.min.js
- M external/mediaelement/build/mediaelementplayer.css
- M external/mediaelement/build/mediaelementplayer.js
- M external/mediaelement/build/mediaelementplayer.min.css
- M external/mediaelement/build/mediaelementplayer.min.js
- M external/mediaelement/build/mejs-skins.css
- M framework/core/assets/css/forms-bootstrap.css
- M framework/core/assets/css/toggle.css
- M framework/core/assets/js/exp-tabs.js
- M framework/core/controllers/expController.php
- M framework/core/controllers/expNestedNodeController.php
- M framework/core/expFramework.php
- M framework/core/forms/basetemplate.php
- M framework/core/forms/controls/bootstrap/filemanagercontrol.php
- M framework/core/forms/controls/checkboxcontrol.php
- M framework/core/forms/controls/ckeditorcontrol.php
- M framework/core/forms/controls/filemanagercontrol.php
- M framework/core/forms/controls/tagpickercontrol.php
- M framework/core/index.php
- M framework/core/lang/Cestina.php
- M framework/core/lang/Dansk.php
- M framework/core/lang/Deutsch.php
- M framework/core/lang/English - US.php
- M framework/core/lang/Espanol.php
- M framework/core/lang/Francais.php
- M framework/core/lang/Norsk.php
- M framework/core/lang/Suomi.php
- M framework/core/models/expConfig.php
- M framework/core/models/expNestedNode.php
- M framework/core/router_maps.php
- M framework/core/subsystems/expCore.php
- M framework/core/subsystems/expDateTime.php
- M framework/core/subsystems/expJavascript.php
- M framework/core/subsystems/expPermissions.php
- M framework/core/subsystems/expString.php
- M framework/core/subsystems/expTheme.php
- M framework/core/subsystems/expValidator.php
- M framework/modules/addressbook/views/address/edit.tpl
- M framework/modules/addressbook/views/address/show.tpl
- M framework/modules/administration/menus/ecomm.php
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/administration/views/administration/install_extension.tpl
- M framework/modules/banners/controllers/bannerController.php
- M framework/modules/banners/models/banner.php
- M framework/modules/blog/controllers/blogController.php
- M framework/modules/blog/views/blog/bloglist.tpl
- M framework/modules/blog/views/blog/edit.tpl
- M framework/modules/blog/views/blog/showall_headlines.tpl
- M framework/modules/blog/views/blog/showall_recent.tpl
- M framework/modules/common/views/configure/facebook.tpl
- M framework/modules/common/views/configure/twitter.tpl
- M framework/modules/container/controllers/containerController.php
- M framework/modules/core/controllers/expCatController.php
- M framework/modules/core/controllers/expCommentController.php
- M framework/modules/core/controllers/expHTMLEditorController.php
- M framework/modules/core/controllers/expTagController.php
- M framework/modules/core/definitions/expCats.php
- M framework/modules/core/models/expCat.php
- M framework/modules/core/models/expTag.php
- M framework/modules/eaas/views/eaas/edit.tpl
- M framework/modules/ealerts/controllers/ealertController.php
- M framework/modules/ecommerce/assets/css/cart.css
- M framework/modules/ecommerce/assets/css/invoice.css
- M framework/modules/ecommerce/assets/css/print-invoice.css
- M framework/modules/ecommerce/assets/css/storefront.css
- M framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl
- M framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl
- M framework/modules/ecommerce/billingcalculators/views/worldpayCheckout/configure.tpl
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/ecommerce/controllers/donationController.php
- M framework/modules/ecommerce/controllers/eventregistrationController.php
- M framework/modules/ecommerce/controllers/orderController.php
- M framework/modules/ecommerce/controllers/storeCategoryController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/models/order.php
- M framework/modules/ecommerce/models/orderitem.php
- M framework/modules/ecommerce/products/models/eventregistration.php
- M framework/modules/ecommerce/products/models/giftcard.php
- M framework/modules/ecommerce/products/models/product.php
- M framework/modules/ecommerce/products/views/eventregistration/cartSummary.tpl
- M framework/modules/ecommerce/products/views/eventregistration/edit.tpl
- M framework/modules/ecommerce/products/views/eventregistration/formatExtraData.tpl
- M framework/modules/ecommerce/products/views/eventregistration/storeListing.tpl
- M framework/modules/ecommerce/products/views/product/child_edit.tpl
- M framework/modules/ecommerce/products/views/product/edit.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/upscalculator/configure.tpl
- M framework/modules/ecommerce/views/ecomconfig/options.tpl
- M framework/modules/ecommerce/views/eventregistration/manage.tpl
- M framework/modules/ecommerce/views/eventregistration/show.tpl
- M framework/modules/ecommerce/views/eventregistration/showall.tpl
- M framework/modules/ecommerce/views/eventregistration/showall_headlines.tpl
- M framework/modules/ecommerce/views/eventregistration/upcomingEvents.tpl
- M framework/modules/ecommerce/views/eventregistration/view_registrants.tpl
- M framework/modules/ecommerce/views/order/email_invoice.tpl
- M framework/modules/ecommerce/views/order/invoice.tpl
- M framework/modules/ecommerce/views/order/partial_summary.tpl
- M framework/modules/ecommerce/views/order/show_packing.tpl
- M framework/modules/ecommerce/views/order/show_printable.tpl
- M framework/modules/ecommerce/views/store/configure/general.tpl
- M framework/modules/ecommerce/views/store/edit_categories.tpl
- M framework/modules/ecommerce/views/store/edit_extrafields.tpl
- M framework/modules/ecommerce/views/store/edit_images.tpl
- M framework/modules/ecommerce/views/store/edit_meta.tpl
- M framework/modules/ecommerce/views/store/edit_options.tpl
- M framework/modules/ecommerce/views/store/edit_userinput.tpl
- M framework/modules/ecommerce/views/store/manage.tpl
- M framework/modules/ecommerce/views/store/quicklinks.tpl
- M framework/modules/ecommerce/views/store/showallCategoryFeaturedProducts.tpl
- M framework/modules/ecommerce/views/store/showallFeaturedProducts.tpl
- M framework/modules/ecommerce/views/storeCategory/configure/general.tpl
- M framework/modules/ecommerce/views/storeCategory/edit.tpl
- M framework/modules/events/controllers/eventController.php
- M framework/modules/events/views/event/_reminder.tpl
- M framework/modules/events/views/event/day.tpl
- M framework/modules/events/views/event/edit.tpl
- M framework/modules/events/views/event/monthlist.tpl
- M framework/modules/events/views/event/showall_Featured Events.tpl
- M framework/modules/events/views/event/showall_Upcoming Events.tpl
- M framework/modules/facebook/controllers/facebookController.php
- M framework/modules/facebook/views/facebook/configure/showall_box.config
- M framework/modules/facebook/views/facebook/showall_box.tpl
- M framework/modules/faq/controllers/faqController.php
- M framework/modules/file/assets/css/filemanager.css
- M framework/modules/file/controllers/fileController.php
- M framework/modules/file/models/expFile.php
- M framework/modules/file/views/file/uploader.tpl
- M framework/modules/filedownloads/views/filedownload/edit.tpl
- M framework/modules/filedownloads/views/filedownload/filedownloaditem.tpl
- M framework/modules/filedownloads/views/filedownload/show.tpl
- M framework/modules/forms/views/forms/edit_form.tpl
- M framework/modules/help/controllers/helpController.php
- M framework/modules/help/models/help.php
- M framework/modules/help/models/help_version.php
- M framework/modules/help/views/help/edit.tpl
- M framework/modules/help/views/help/show.tpl
- M framework/modules/help/views/help/showall.tpl
- M framework/modules/navigation/controllers/navigationController.php
- M framework/modules/navigation/views/navigation/edit_contentpage.bootstrap.tpl
- M framework/modules/navigation/views/navigation/edit_contentpage.tpl
- M framework/modules/news/controllers/newsController.php
- M framework/modules/news/views/news/edit.tpl
- M framework/modules/news/views/news/newsitem.tpl
- M framework/modules/news/views/news/newslist.tpl
- M framework/modules/news/views/news/showall_announcement.tpl
- M framework/modules/news/views/news/showall_recent.tpl
- M framework/modules/photoalbum/controllers/photosController.php
- M framework/modules/photoalbum/models/photo.php
- M framework/modules/photoalbum/views/photo/edit.tpl
- M framework/modules/photoalbum/views/photo/show.tpl
- M framework/modules/portfolio/views/portfolio/edit.tpl
- M framework/modules/portfolio/views/portfolio/portfolioitem.tpl
- M framework/modules/portfolio/views/portfolio/portfoliolist_toggle.tpl
- M framework/modules/recyclebin/models/recyclebin.php
- M framework/modules/rss/models/expRss.php
- M framework/modules/search/controllers/searchController.php
- M framework/modules/search/models/search.php
- M framework/modules/search/views/search/configure/show.config
- M framework/modules/search/views/search/searchlist.tpl
- M framework/modules/text/controllers/textController.php
- M framework/modules/twitter/controllers/twitterController.php
- M framework/modules/twitter/views/twitter/configure/twitter.tpl
- M framework/modules/users/controllers/usersController.php
- M framework/plugins/function.get_object.php
- M framework/plugins/function.getchromemenu.php
- M framework/plugins/function.max_filesize.php
- M framework/plugins/function.optiondisplayer.php
- M framework/plugins/function.securelink.php
- M framework/plugins/modifier.highlight.php
- M framework/plugins/modifier.summarize.php
- M index.php
- M install/include/sanity.php
- M install/pages/install-3.php
- M install/pages/upgrade-4.php
- M install/samples/store.eql
- M install/upgrades/clean_modstate.php
- M install/upgrades/fix_database.php
- M install/upgrades/remove_oldfiles.php
- M install/upgrades/update_event_registration.php
- M install/upgrades/version_tracking.php
- M phpdoc.xml
- M themes/bootstraptheme/less/bootstrapcontrols.less
- M themes/simpletheme/css/0-base-styles.css
- M themes/simpletheme/index.php
- M themes/simpletheme/mobile/index.php
- M themes/simpletheme/subthemes/Follow Parent.php
- M themes/simpletheme/subthemes/Left Sectional.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