From: Anthony Talarico Date: Thu, 14 Mar 2019 00:36:22 +0000 (-0400) Subject: Merge branch 'develop' into feature/adminRevamp X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c205f13b270c40bf86db71898c5becfffc16b000;p=WP-Plugins%2Fglm-member-db.git Merge branch 'develop' into feature/adminRevamp --- c205f13b270c40bf86db71898c5becfffc16b000 diff --cc setup/validActions.php index 08509d59,eea0ce5d..7adc6cd4 --- a/setup/validActions.php +++ b/setup/validActions.php @@@ -33,30 -33,25 +33,31 @@@ $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', - 'verifyLatLon' => 'glm-member-db', + 'verifyLatLon' => 'glm-member-db', + 'memberCountCheck' => 'glm-member-db', ), 'dashboard' => array( 'index' => 'glm-member-db',