From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 19 Jun 2019 13:46:40 +0000 (-0400)
Subject: Merge tag 'v1.7.26' into develop
X-Git-Tag: v1.7.29^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=ca746f3703d3905d0c1440e7385b4765ee2d2846;p=WP-Plugins%2Fglm-member-db-events.git

Merge tag 'v1.7.26' into develop

Version 1.7.26
---

ca746f3703d3905d0c1440e7385b4765ee2d2846
diff --cc index.php
index 54995db,02f817b..ef4c510
--- a/index.php
+++ b/index.php
@@@ -43,8 -43,11 +43,11 @@@ if (!defined('ABSPATH')) 
   *  so that we're sure the other add-ons see an up to date
   *  version from this plugin.
   */
- define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.7.25');
+ define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.7.26');
+ /**
+  * Plugin DB Version
+  */
 -define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.14');
 +define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.15');
  
  // This is the minimum version of the GLM Members DB plugin require for this plugin.
  define('GLM_MEMBERS_EVENTS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.9.15');
diff --cc readme.txt
index 1894c7f,f4dcb54..722d8ed
--- a/readme.txt
+++ b/readme.txt
@@@ -25,11 -25,11 +25,16 @@@ e.g
  1. Activate the plugin through the 'Plugins' menu in WordPress
  
  == Changelog ==
 +=  Pending =
 +New options
 +* Read more button options
 +* Minimum number of events option
 +
+ = 1.7.26 =
+ * Updating date on detail page per Jodie request that the date span not be
+   used if from the agenda view but instead show the date of that event per the
+   date they are looking at.
+ 
  = 1.7.23 =
  * Adding counties to event locations
  
diff --cc views/front/events/agenda_new.html
index 30557f7,979604d..691f4eb
--- a/views/front/events/agenda_new.html
+++ b/views/front/events/agenda_new.html
@@@ -67,11 -56,9 +67,11 @@@ a.glm-read-more:hover, a.event-read-mor
  
                                  {$showTime = true}
  
 -                                <div class="glma-row glm-event-day-event{if $settings.sort_by_featured_in_agenda && $event.featured.value} glm-event-featured{/if}" data-url="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/{else}?eventId={$event.id}{/if}">
 -                                    <div class="glma-small-12 {if $event.image}glma-large-8 {/if}glma-columns">
 -                                        <a class="glm-link" href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/?glm_event_from={$date|date_format:"%Y-%m-%d"}{else}?eventId={$event.id}{/if}">
 +                                <div
 +                                    class="glma-row glm-event-day-event{if $settings.sort_by_featured_in_agenda && $event.featured.value} glm-event-featured{/if}"
-                                     data-url="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/?glm_event_from={$date|date_format:"%Y-%m-%d"}{else}?eventId={$event.id}{/if}">
++                                    data-url="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/?glm_event_from={$date|date_format:"%Y-%m-%d"}{else}&eventId={$event.id}{/if}">
 +                                    <div class="glma-small-12 {if $event.image}glma-large-9 {/if}glma-columns">
-                                         <a class="glm-link" href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}?glm_event_from={$date|date_format:"%Y-%m-%d"}/{else}?eventId={$event.id}{/if}">
++                                        <a class="glm-link" href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/?glm_event_from={$date|date_format:"%Y-%m-%d"}/{else}?eventId={$event.id}{/if}">
                                              <h2 class="agenda-event-name">{$event.name}</h2>
                                          </a>
  
@@@ -152,6 -139,8 +152,11 @@@
                                          <img class="" style="float:none;" src="{$imgUrl}{$event.image}">
                                      </div>
                                      {/if}
+ <<<<<<< HEAD
+ =======
++<<<<<<< HEAD
++=======
++>>>>>>> v1.7.26
  
                                      {if $settings.agenda_view_more_enabled}
                                          <div>
@@@ -163,6 -152,7 +168,10 @@@
                                          </div>
                                      {/if}
  
++<<<<<<< HEAD
++=======
+ >>>>>>> dc38bda... Setup event detail page to show only the date a recurring event is on.
++>>>>>>> v1.7.26
                                  </div>
                              {/foreach}
                          {/foreach}