From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 27 Feb 2019 19:27:25 +0000 (-0500)
Subject: Merge branch 'develop' into feature/adminRevamp
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c4288d85c95ee08c7334fc50ea7b7642260d847f;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' into feature/adminRevamp
---

c4288d85c95ee08c7334fc50ea7b7642260d847f
diff --cc setup/validActions.php
index 90654839,fea58a8e..b027aa1d
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@@ -33,28 -33,23 +33,29 @@@
  $glmMembersValidActions = array(
      'adminActions' => array(
          'ajax' => array(
 -            'imageUpload'         => 'glm-member-db',
 -            'fileUpload'          => 'glm-member-db',
 -            'newOldMemberIdsCsv'  => 'glm-member-db',
 -            'membersListExport'   => 'glm-member-db',
 -            'memberClickThrough'  => 'glm-member-db',
 -            'memberDetailClick'   => 'glm-member-db',
 -            'memberGraphs'        => 'glm-member-db',
 -            'fileLibraryUpload'   => 'glm-member-db',
 -            'fileLibraryDownload' => 'glm-member-db',
 -            'fileLibraryDelete'   => 'glm-member-db',
 -            'fileLibraryUpdate'   => 'glm-member-db',
 -            'glmCron'             => 'glm-member-db',
 -            'membersMapData'      => 'glm-member-db',
 -            'citiesMapData'       => 'glm-member-db',
 -            'countiesMapData'     => 'glm-member-db',
 +            'imageUpload'           => 'glm-member-db',
 +            'fileUpload'            => 'glm-member-db',
 +            'newOldMemberIdsCsv'    => 'glm-member-db',
 +            'membersListExport'     => 'glm-member-db',
 +            'memberClickThrough'    => 'glm-member-db',
 +            'memberDetailClick'     => 'glm-member-db',
 +            'memberGraphs'          => 'glm-member-db',
 +            'fileLibraryUpload'     => 'glm-member-db',
 +            'fileLibraryDownload'   => 'glm-member-db',
 +            'fileLibraryDelete'     => 'glm-member-db',
 +            'fileLibraryUpdate'     => 'glm-member-db',
 +            'glmCron'               => 'glm-member-db',
 +            'membersMapData'        => 'glm-member-db',
 +            'citiesMapData'         => 'glm-member-db',
 +            'countiesMapData'       => 'glm-member-db',
 +            'glmTextSearch'         => 'glm-member-db',
 +            'adminSearch'           => 'glm-member-db',
 +            'memberManagement'      => 'glm-member-db',
 +        ),
 +        'manageDashboard' => array(
 +            'members' => 'glm-member-db',
              'membersList'         => 'glm-member-db',
+             'membersListJson'     => 'glm-member-db',
          ),
          'dashboard' => array(
              'index'   => 'glm-member-db',