From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 25 Feb 2016 20:53:46 +0000 (-0500)
Subject: Merge branch 'develop' into feature/steve
X-Git-Tag: v1.0.0^2~187
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=de7ff5135bab434fa1a7f6c20bb660491ea6f3d5;p=WP-Plugins%2Fglm-member-db-events.git

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

de7ff5135bab434fa1a7f6c20bb660491ea6f3d5
diff --cc setup/validActions.php
index e5ab238,50b75f0..484ff11
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@@ -38,12 -40,12 +40,11 @@@ $glmMembersEventsAddOnValidActions = ar
          'events' => array(
              'index' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
              'more' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
+             'add' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
+             'categories' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG
          ),
-         'info' => array(
-             'index' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG
-         )
      ),
      'frontActions' => array(
 -/*
          'events' => array(
              'list' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
              'detail' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG