Changeset [10098fdd3f0bb3c668ae3f0a7f4126b8dd2d58cd] by dleffler
Revision 10098fdd3f0bb3c668ae3f0a7f4126b8dd2d58cd,
committed by dleffler
· November 12th, 2016 @ 02:14 PM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/10098fdd3f0bb3c6...
77 changed files
-
A
framework/modules/navigation/definitions/redirect.php -
A
framework/modules/navigation/definitions/redirect_map.php -
A
framework/modules/navigation/models/redirect.php -
A
framework/modules/navigation/views/navigation/edit_redirection.tpl -
A
framework/modules/navigation/views/navigation/manage_redirection.tpl -
A
framework/modules/navigation/views/navigation/manage_redirection_log.tpl -
M
framework/conf/extensions/error.defaults.php -
M
framework/core/controllers/expController.php -
M
framework/core/controllers/expNestedNodeController.php -
M
framework/core/forms/controls/bootstrap/checkboxcontrol.php -
M
framework/core/forms/controls/bootstrap/datetimecontrol.php -
M
framework/core/forms/controls/bootstrap/dropdowncontrol.php -
M
framework/core/forms/controls/bootstrap/formcontrol.php -
M
framework/core/forms/controls/bootstrap/uploadcontrol.php -
M
framework/core/forms/controls/bootstrap3/calendarcontrol.php -
M
framework/core/forms/controls/bootstrap3/checkboxcontrol.php -
M
framework/core/forms/controls/bootstrap3/datetimecontrol.php -
M
framework/core/forms/controls/bootstrap3/dropdowncontrol.php -
M
framework/core/forms/controls/bootstrap3/listbuildercontrol.php -
M
framework/core/forms/controls/bootstrap3/popupdatetimecontrol.php -
M
framework/core/forms/controls/bootstrap3/radiogroupcontrol.php -
M
framework/core/forms/controls/bootstrap3/uploadcontrol.php -
M
framework/core/forms/controls/bootstrap3/yuicalendarcontrol.php -
M
framework/core/forms/controls/bootstrap3/yuidatetimecontrol.php -
M
framework/core/forms/controls/checkboxcontrol.php -
M
framework/core/forms/controls/datetimecontrol.php -
M
framework/core/forms/controls/dropdowncontrol.php -
M
framework/core/forms/controls/formcontrol.php -
M
framework/core/forms/controls/jquery/calendarcontrol.php -
M
framework/core/forms/controls/jquery/listbuildercontrol.php -
M
framework/core/forms/controls/jquery/popupdatetimecontrol.php -
M
framework/core/forms/controls/jquery/yuicalendarcontrol.php -
M
framework/core/forms/controls/jquery/yuidatetimecontrol.php -
M
framework/core/forms/controls/listbuildercontrol.php -
M
framework/core/forms/controls/newui/checkboxcontrol.php -
M
framework/core/forms/controls/newui/datetimecontrol.php -
M
framework/core/forms/controls/newui/dropdowncontrol.php -
M
framework/core/forms/controls/newui/formcontrol.php -
M
framework/core/forms/controls/newui/radiogroupcontrol.php -
M
framework/core/forms/controls/radiogroupcontrol.php -
M
framework/core/forms/controls/texteditorcontrol.php -
M
framework/core/forms/controls/uploadcontrol.php -
M
framework/core/forms/controls/yuicalendarcontrol.php -
M
framework/core/forms/controls/yuidatetimecontrol.php -
M
framework/core/models/expConfig.php -
M
framework/core/models/expRecord.php -
M
framework/core/subsystems/database/mysqli.php -
M
framework/core/subsystems/expCore.php -
M
framework/core/subsystems/expPaginator.php -
M
framework/core/subsystems/expRouter.php -
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/core/models/expCat.php -
M
framework/modules/ecommerce/controllers/storeCategoryController.php -
M
framework/modules/forms/controllers/formsController.php -
M
framework/modules/forms/views/forms/enterdata.tpl -
M
framework/modules/forms/views/forms/showall.bootstrap.tpl -
M
framework/modules/forms/views/forms/showall.bootstrap3.tpl -
M
framework/modules/forms/views/forms/showall.tpl -
M
framework/modules/forms/views/forms/showall_portfolio.tpl -
M
framework/modules/help/models/help.php -
M
framework/modules/migration/controllers/migrationController.php -
M
framework/modules/navigation/controllers/navigationController.php -
M
framework/modules/navigation/models/section.php -
M
framework/modules/navigation/views/navigation/manage.bootstrap3.tpl -
M
framework/modules/navigation/views/navigation/manage.newui.tpl -
M
framework/modules/navigation/views/navigation/manage.tpl -
M
framework/modules/navigation/views/navigation/manage_sitemap.bootstrap.tpl -
M
framework/modules/navigation/views/navigation/manage_sitemap.bootstrap3.tpl -
M
framework/modules/navigation/views/navigation/manage_sitemap.tpl -
M
framework/modules/notfound/controllers/notfoundController.php -
M
framework/modules/text/views/text/showall_accordion.tpl -
M
framework/modules/users/controllers/usersController.php -
M
framework/plugins/function.control.php -
M
framework/plugins/function.link.php -
M
install/upgrades/fix_sef_urls.php