Merge master into ibranch

static/directives/robots-manager.html

@@ -16,9 +16,7 @@
       be shared, such as deployment systems.
     </div>
 
-    <div class="manager-filter-box" ng-show="robots.length">
-       <input class="form-control" type="text" ng-model="robotFilter" placeholder="Filter Robot Accounts...">
-    </div>
+    <div class="filter-box" collection="robots" filter-model="robotFilter" filter-name="Robot Accounts"></div>
 
     <div class="empty" ng-if="!robots.length">
       <div class="empty-primary-msg">No robot accounts defined.</div>
@@ -39,7 +37,7 @@
         <td class="caret-col hidden-xs" ng-if="(user || organization.is_admin) && Config.isNewLayout()"></td>
         <td>Robot Account Name</td>
         <td ng-if="organization && Config.isNewLayout()">Teams</td>
-        <td ng-if="Config.isNewLayout()">Repository Permissions</td>
+        <td ng-if="Config.isNewLayout()">Direct Repository Permissions</td>
         <td class="options-col"></td>
       </thead>
 
@@ -73,11 +71,11 @@
           </td>
           <td ng-if="Config.isNewLayout()">
             <span class="empty" ng-if="robotInfo.repositories.length == 0">
-              (No permissions on any repositories)
+              (No direct permissions on any repositories)
             </span>
 
             <span class="member-perm-summary" ng-if="robotInfo.repositories.length > 0">
-              Permissions on
+              Direct Permissions on
               <span class="anchor hidden-xs" href="javascript:void(0)" is-text-only="!organization.is_admin"
                     ng-click="showPermissions(robotInfo)">{{ robotInfo.repositories.length }}
                 <span ng-if="robotInfo.repositories.length == 1">repository</span>