Changeset [89c0df099fbd3ca18c1f1d13a289da3bf6cfe45d] by dleffler
January 7th, 2016 @ 09:11 PM
Merge branch 'develop' into test-dave
Conflicts:
framework/plugins/function.pagelinks.php
themes/bootstrap3theme/less/bootstraptheme.less
https://github.com/exponentcms/exponent-cms/commit/89c0df099fbd3ca1...
Committed by dleffler
- A install/changes/2.3.8.txt
- A tmp/elfinder/.htaccess
- M CHANGELOG.md
- M RELEASE.md
- M framework/core/forms/controls/bootstrap3/filemanagercontrol.php
- M framework/core/forms/controls/newui/filemanagercontrol.php
- M framework/core/models/expRecord.php
- M framework/core/subsystems/expPaginator.php
- M framework/core/views/_maintenance.tpl
- M framework/modules/addressbook/views/address/edit.bootstrap3.tpl
- M framework/modules/addressbook/views/address/edit.tpl
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/views/administration/configure_site.bootstrap3.tpl
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/administration/views/administration/toolbar.bootstrap3.tpl
- M framework/modules/administration/views/administration/toolbar.newui.tpl
- M framework/modules/blog/views/blog/blogitem.tpl
- M framework/modules/blog/views/blog/bloglist.tpl
- M framework/modules/blog/views/blog/show.tpl
- M framework/modules/blog/views/blog/showall.tpl
- M framework/modules/blog/views/blog/showall_recent.tpl
- M framework/modules/core/controllers/expCatController.php
- M framework/modules/ecommerce/views/cart/checkout.bootstrap3.tpl
- M framework/modules/ecommerce/views/cart/checkout.tpl
- M framework/modules/ecommerce/views/cart/confirm.tpl
- M framework/modules/ecommerce/views/cart/preprocess.tpl
- M framework/modules/ecommerce/views/cart/process.tpl
- M framework/modules/ecommerce/views/cart/show.tpl
- M framework/modules/ecommerce/views/eventregistration/eventsCalendar.tpl
- M framework/modules/ecommerce/views/order/myOrder.tpl
- M framework/modules/ecommerce/views/store/eventsCalendar.tpl
- M framework/modules/events/views/event/showall.tpl
- M framework/modules/events/views/event/showall_Day.tpl
- M framework/modules/events/views/event/showall_Monthly List.tpl
- M framework/modules/events/views/event/showall_Week.tpl
- M framework/modules/file/connector/elfinder.php
- M framework/modules/file/models/expFile.php
- M framework/modules/filedownloads/views/filedownload/showall.tpl
- M framework/modules/importexport/controllers/importexportController.php
- M framework/modules/mediaplayer/views/media/showall.bootstrap3.tpl
- M framework/modules/mediaplayer/views/media/showall.tpl
- M framework/modules/news/views/news/show.tpl
- M framework/modules/news/views/news/showall.tpl
- M framework/modules/photoalbum/views/photo/showall.bootstrap3.tpl
- M framework/modules/photoalbum/views/photo/showall.tpl
- M framework/modules/portfolio/views/portfolio/showall.tpl
- M framework/modules/portfolio/views/portfolio/showall_simple_list.tpl
- M framework/modules/portfolio/views/portfolio/showall_toggle.tpl
- M framework/modules/search/views/search/search.tpl
- M framework/modules/users/views/login/showlogin.bootstrap.tpl
- M framework/modules/users/views/login/showlogin.bootstrap3.tpl
- M framework/modules/users/views/login/showlogin.newui.tpl
- M framework/modules/users/views/login/showlogin.tpl
- M framework/plugins/block.assocarray.php
- M framework/plugins/function.pagelinks.php
- M themes/bootstrap3theme/less/bootstraptheme.less
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