Changeset [cbada566d52ce8154468108293bfb0b1843eca5e] by dleffler
Revision cbada566d52ce8154468108293bfb0b1843eca5e,
committed by dleffler
· November 4th, 2016 @ 07:47 PM
Merge branch 'develop'
Conflicts:
RELEASE.md
https://github.com/exponentcms/exponent-cms/commit/cbada566d52ce815...
49 changed files
-
A
install/changes/2.4.1.txt -
M
CHANGELOG.md -
M
RELEASE.md -
M
exponent_version.php -
M
external/ExtPrograms.csv -
M
external/jquery/addons/css/owl.carousel.css -
M
external/jquery/addons/css/owl.theme.default.css -
M
external/jquery/addons/css/owl.theme.green.css -
M
external/jquery/addons/js/jstree.js -
M
external/jquery/addons/js/owl.carousel.js -
M
external/jquery/addons/js/themes/default-dark/style.css -
M
external/jquery/addons/js/themes/default/style.css -
M
framework/core/controllers/expController.php -
M
framework/core/expFramework.php -
M
framework/core/forms/controls/bootstrap/textcontrol.php -
M
framework/core/forms/controls/bootstrap3/calendarcontrol.php -
M
framework/core/forms/controls/bootstrap3/popupdatetimecontrol.php -
M
framework/core/forms/controls/bootstrap3/yuicalendarcontrol.php -
M
framework/core/forms/controls/calendarcontrol.php -
M
framework/core/forms/controls/jquery/calendarcontrol.php -
M
framework/core/forms/controls/jquery/popupdatetimecontrol.php -
M
framework/core/forms/controls/jquery/yuicalendarcontrol.php -
M
framework/core/forms/controls/popupdatetimecontrol.php -
M
framework/core/forms/controls/textcontrol.php -
M
framework/core/forms/controls/yuicalendarcontrol.php -
M
framework/core/subsystems/expCSS.php -
M
framework/core/subsystems/expPaginator.php -
M
framework/core/subsystems/expRouter.php -
M
framework/core/subsystems/expString.php -
M
framework/modules/addressbook/controllers/addressController.php -
M
framework/modules/core/controllers/expHTMLEditorController.php -
M
framework/modules/core/controllers/expRatingController.php -
M
framework/modules/countdown/views/countdown/show_circles.tpl -
M
framework/modules/ecommerce/controllers/orderController.php -
M
framework/modules/events/views/event/email/RSVP Form.tpl -
M
framework/modules/events/views/event/showall_announcement.bootstrap3.tpl -
M
framework/modules/events/views/event/showall_announcement.tpl -
M
framework/modules/file/connector/elfinder.php -
M
framework/modules/file/controllers/fileController.php -
M
framework/modules/file/models/expFile.php -
M
framework/modules/forms/controllers/formsController.php -
M
framework/modules/forms/views/forms/design_form.bootstrap3.tpl -
M
framework/modules/navigation/controllers/navigationController.php -
M
framework/modules/pixidou/controllers/pixidouController.php -
M
framework/modules/search/controllers/searchController.php -
M
framework/modules/users/controllers/usersController.php -
M
framework/plugins/function.control.php -
M
install/index.php -
M
phpdoc.xml