From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 16 Feb 2016 15:27:35 +0000 (-0500)
Subject: Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
X-Git-Tag: v2.0.0^2~79
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ac5814340e323ddf6aa5c2ecd1938b30521cd69f;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop

Conflicts:
	glm-member-db.php
	views/admin/members/index.html
---

ac5814340e323ddf6aa5c2ecd1938b30521cd69f
diff --cc glm-member-db.php
index 1ba06e98,b8f81c1b..4fb66e22
--- a/glm-member-db.php
+++ b/glm-member-db.php
@@@ -38,8 -41,8 +38,8 @@@
   *
   */
  
- define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.57');
+ define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.58');
 -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.0.43');
 +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.0');
  
  // Check if plugin version is not current in WordPress option and if needed updated it
  if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) {
diff --cc views/admin/members/index.html
index eaf7dd5e,04f22513..60eedf0a
--- a/views/admin/members/index.html
+++ b/views/admin/members/index.html
@@@ -78,10 -86,16 +78,16 @@@
              <tr class="alternate">
          {/if}
                  <td>
-                     <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberEdit&memberID={$p.id}">{$p.name}</a>
+                     <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&memberInfo={$p.id}">{$p.member}</a>
+                 </td>
+                 <td>
+                     {$p.modify_time.datetime}
+                 </td>
+                 <td>
+                     {$p.reference_name}
                  </td>
                  <td>
 -                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$p.member_pointer}&id={$p.id}}" class="button button-secondary glm-button-small glm-right">Manage</a>
 +                    {$p.created.date}
                  </td>
              </tr>
      {/foreach}