Changeset [db6501aef2537d82fe82ef0500fec8b15dc54574] by dleffler
March 16th, 2013 @ 12:22 AM
Merge branch 'develop' into feature/container2
Conflicts:
framework/modules/administration/menus/admin.php
framework/modules/ecommerce/views/order/show_packing.tpl
install/upgrades/upgrade_forms.php
install/upgrades/upgrade_navigation.php
https://github.com/exponentcms/exponent-cms/commit/db6501aef2537d82...
Committed by dleffler
- A framework/modules/eaas/controllers/eaasController.php
- A framework/modules/eaas/views/eaas/configure/Blog.tpl
- A framework/modules/eaas/views/eaas/configure/Events.tpl
- A framework/modules/eaas/views/eaas/configure/File_Downloads.tpl
- A framework/modules/eaas/views/eaas/configure/News.tpl
- A framework/modules/eaas/views/eaas/configure/Photo.tpl
- A framework/modules/eaas/views/eaas/configure/YouTube.tpl
- A framework/modules/eaas/views/eaas/configure/about_us.tpl
- A framework/modules/eaas/views/eaas/edit.tpl
- A framework/modules/eaas/views/eaas/showall.tpl
- M CHANGELOG.md
- M framework/conf/data/date_format.dropdown
- M framework/conf/data/datetime_format.dropdown
- M framework/conf/data/time_format.dropdown
- M framework/conf/extensions/display.defaults.php
- M framework/core/controllers/expController.php
- M framework/core/subsystems/expAjaxReply.php
- M framework/core/subsystems/expJavascript.php
- M framework/core/subsystems/expVersion.php
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/blog/controllers/blogController.php
- M framework/modules/ecommerce/views/order/show_packing.tpl
- M framework/modules/news/controllers/newsController.php
- M framework/modules/portfolio/controllers/portfolioController.php
- M framework/modules/youtube/definitions/youtube.php
- M index.php
- M install/changes/2.1.4.txt
- M install/upgrades/upgrade_forms.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