Merge branch 'develop' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 13:22:38 +0000 (09:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 13:22:38 +0000 (09:22 -0400)
1  2 
setup/frontHooks.php
setup/validActions.php

Simple merge
@@@ -88,12 -85,15 +88,13 @@@ $glmMembersValidActions = array
      ),
      'frontActions' => array(
          'members' => array(
-             'list'   => 'glm-member-db',
-             'detail' => 'glm-member-db',
+             'list'                  => 'glm-member-db',
+             'detail'                => 'glm-member-db',
+             'featured'              => 'glm-member-db'
          ),
          'error' => array(
 -            'index'                 => 'glm-member-db',
 -            'badAction'             => 'glm-member-db'
 -        )
 -    )
 +            'index'     => 'glm-member-db',
 +            'badAction' => 'glm-member-db',
 +        ),
 +    ),
  );
 -
 -?>