Merge tag 'v1.3.11' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Sep 2016 20:22:07 +0000 (16:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Sep 2016 20:22:07 +0000 (16:22 -0400)
Version 1.3.11

1  2 
js/dashboard.js
models/front/events/list.php

diff --cc js/dashboard.js
@@@ -1,14 -1,18 +1,18 @@@
  (function(){
-     if (jQuery('#glm-event-from').length > 0) {
-         jQuery('#glm-event-from').datepicker();
-         jQuery('#glm-event-to').datepicker();
+     if ($('#glm-event-from').length > 0) {
+         $('#glm-event-from').datepicker({
+             dateFormat: "mm/dd/yy"
+         });
+         $('#glm-event-to').datepicker({
+             dateFormat: "mm/dd/yy"
+         });
      }
 -    $('#glm-event-detail-backtosearch').click(function(){
 +    jQuery('#glm-event-detail-backtosearch').click(function(){
          window.history.back();
      });
 -    if ($('#eventDetail-map').length > 0) {
 +    if (jQuery('#eventDetail-map').length > 0) {
          GLM_GeoMap.initialize();
 -        $('#map-dialog').dialog({
 +        jQuery('#map-dialog').dialog({
              height: 490,
              width: 630,
              modal: true,
Simple merge