Merge branch 'develop'

# Conflicts:
#	RELEASE.md

CHANGELOG.md

@@ -8,6 +8,15 @@ For a more detailed changelog visit [https://github.com/exponentcms/exponent-cms
 
 ----------
 
+Version 2.4.1
+-------------
+### Address issues in v2.4.0, fix security vulnerabilities, and accessibility hints
+  - 
+### Known Issues
+  - eCommerce purchase-order functionality has not been tested/is not be complete
+  - Item re-ranking (ddrerank) doesn't account for aggregation
+  - LDAP support may not work in all LDAP server scenarios due to limited testing
+
 Version 2.4.0
 -------------
 ### Address issues in v2.3.9, fix security vulnerabilities, and add accessibility hints

RELEASE.md

@@ -8,8 +8,8 @@ Release Notes for Exponent Content Management System
 
 For a complete list of the changes made from release to release, see the [CHANGELOG.md](CHANGELOG.md)
 
-## 2.3.9 - September 2016
+## 2.4.1 - January 2017
 
 ----------
 
-### Address issues in v2.3.8
+### Address issues in v2.4.0

exponent_version.php

@@ -50,7 +50,7 @@
 		// the info for the "next" version if we are a pre-release from the repository
 		define('EXPONENT_VERSION_MAJOR','2');
 		define('EXPONENT_VERSION_MINOR','4');
-		define('EXPONENT_VERSION_REVISION','0');
+		define('EXPONENT_VERSION_REVISION','1');
 		define('EXPONENT_VERSION_TYPE','develop');
 		define('EXPONENT_VERSION_ITERATION','');
 		define('EXPONENT_VERSION_BUILDDATE',time());

external/ExtPrograms.csv

@@ -57,15 +57,15 @@ yadcf,0.9.0,github.com/vedmack/yadcf,0.9.0,
 tag-it,2,aehlke.github.io/tag-it/,2,renamed css file to same as js file for our loader
 multiselect,2,mind2soft.com/labs/jquery/multiselect/,2,
 excoloSlider,1.1.0,excolo.github.io/Excolo-Slider/,1.1.0,
-OwlCarousel2,2.1.6,github.com/smashingboxes/OwlCarousel2,2.1.6,
+OwlCarousel2,2.2.0,github.com/smashingboxes/OwlCarousel2,2.2.0,
 colorbox,1.6.4,www.jacklmoore.com/colorbox,1.6.4,using style #5 renamed to jquery.colorbox.css
 Searcher,0.3.0,github.com/lloiser/jquery-searcher/,0.3.0,
 DateTimePicker,2.5.4exp,xdsoft.net/jqplugins/datetimepicker/,2.5.4,we add .js auto-close on inline date select and extra 'reset' work & remove .css z-index issue
 Bootstrap DateTimePicker,4.17.37,github.com/Eonasdan/bootstrap-datetimepicker,4.17.43,patch for 'today' in side-by-side view
 moment.js,2.15.2,github.com/moment/moment,2.15.2,needed for Bootstrap DateTimePicker
 strength-meter,1.1.3,github.com/kartik-v/strength-meter,1.1.3,
 Sortable,1.4.2exp,github.com/RubaXa/Sortable,1.4.2,patched with dragout fix
-jstree,3.3.2,github.com/vakata/jstree,3.3.2,added nav menu icons to stylesheet
+jstree,3.3.3,github.com/vakata/jstree,3.3.3,added nav menu icons to stylesheet
 bootstrap3-dialog,1.35.3,github.com/nakupanda/bootstrap3-dialog,1.35.3,use /src .less file and add our .less variable imports
 impromptu,6.2.3,trentrichardson.com/Impromptu,6.2.3,add some colors to .css
 bootstrap-touch-carousel,0.8.0exp,github.com/ixisio/bootstrap-touch-carousel,0.8.0,patched with vertical drag fix

external/jquery/addons/css/owl.carousel.css

@@ -1,5 +1,5 @@
 /**
- * Owl Carousel v2.1.6
+ * Owl Carousel v2.2.0
  * Copyright 2013-2016 David Deutsch
  * Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
  */
@@ -60,7 +60,7 @@
   .owl-carousel.owl-hidden {
     opacity: 0; }
   .owl-carousel.owl-refresh .owl-item {
-    display: none; }
+    visibility: hidden; }
   .owl-carousel.owl-drag .owl-item {
     -webkit-user-select: none;
     -moz-user-select: none;
@@ -82,8 +82,10 @@
  *  Owl Carousel - Animate Plugin
  */
 .owl-carousel .animated {
-  animation-duration: 1000ms;
-  animation-fill-mode: both; }
+  -webkit-animation-duration: 1000ms;
+          animation-duration: 1000ms;
+  -webkit-animation-fill-mode: both;
+          animation-fill-mode: both; }
 
 .owl-carousel .owl-animated-in {
   z-index: 0; }
@@ -92,7 +94,14 @@
   z-index: 1; }
 
 .owl-carousel .fadeOut {
-  animation-name: fadeOut; }
+  -webkit-animation-name: fadeOut;
+          animation-name: fadeOut; }
+
+@-webkit-keyframes fadeOut {
+  0% {
+    opacity: 1; }
+  100% {
+    opacity: 0; } }
 
 @keyframes fadeOut {
   0% {
@@ -114,7 +123,8 @@
   transition: opacity 400ms ease; }
 
 .owl-carousel .owl-item img.owl-lazy {
-  transform-style: preserve-3d; }
+  -webkit-transform-style: preserve-3d;
+          transform-style: preserve-3d; }
 
 /*
  * 	Owl Carousel - Video Plugin
@@ -136,11 +146,13 @@
   cursor: pointer;
   z-index: 1;
   -webkit-backface-visibility: hidden;
+  transition: -webkit-transform 100ms ease;
   transition: transform 100ms ease; }
 
 .owl-carousel .owl-video-play-icon:hover {
-  -ms-transform: scale(1.3, 1.3);
-      transform: scale(1.3, 1.3); }
+  -webkit-transform: scale(1.3, 1.3);
+      -ms-transform: scale(1.3, 1.3);
+          transform: scale(1.3, 1.3); }
 
 .owl-carousel .owl-video-playing .owl-video-tn,
 .owl-carousel .owl-video-playing .owl-video-play-icon {

external/jquery/addons/css/owl.theme.default.css

@@ -1,5 +1,5 @@
 /**
- * Owl Carousel v2.1.6
+ * Owl Carousel v2.2.0
  * Copyright 2013-2016 David Deutsch
  * Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
  */

external/jquery/addons/css/owl.theme.green.css

@@ -1,5 +1,5 @@
 /**
- * Owl Carousel v2.1.6
+ * Owl Carousel v2.2.0
  * Copyright 2013-2016 David Deutsch
  * Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
  */