From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 14 Jun 2016 19:20:50 +0000 (-0400)
Subject: Merge branch 'feature/groupedAmenities' into develop
X-Git-Tag: v2.1^2~3^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=519a08949776fc273b15da8e534bc2332bca9258;p=WP-Plugins%2Fglm-member-db.git

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

519a08949776fc273b15da8e534bc2332bca9258
diff --cc setup/validActions.php
index 53d2d5ad,8e4dee80..59ee01f7
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@@ -33,23 -33,22 +33,24 @@@
  $glmMembersValidActions = array(
      'adminActions' => array(
          'ajax' => array(
 +                'imageUpload' => 'glm-member-db',
 +                'newOldMemberIdsCsv' => 'glm-member-db'
+             'imageUpload' => 'glm-member-db',
          ),
          'dashboardWidget' => array(
-                 'index' => 'glm-member-db'
+             'index' => 'glm-member-db',
          ),
          'members' => array(
-                 'index' => 'glm-member-db',            // member list
-                 'list' => 'glm-member-db',
-                 'reports' => 'glm-member-db',
-                 'other' => 'glm-member-db'
+             'index'   => 'glm-member-db',            // member list
+             'list'    => 'glm-member-db',
+             'reports' => 'glm-member-db',
+             'other'   => 'glm-member-db',
          ),
          'member' => array(
-                 'index' => 'glm-member-db',            // Member Dashboard
-                 'memberInfo' => 'glm-member-db',
-                 'memberEdit' => 'glm-member-db',
-                 'locations' => 'glm-member-db'
+             'index'      => 'glm-member-db',            // Member Dashboard
+             'memberInfo' => 'glm-member-db',
+             'memberEdit' => 'glm-member-db',
+             'locations'  => 'glm-member-db',
          )
          ,
          'settings' => array(