Merge remote-tracking branch 'origin/stable'

app/grants/router.py

@@ -59,6 +59,10 @@ def get_queryset(self):
         if 'pk' in param_keys:
             queryset = queryset.filter(pk=self.request.query_params.get('pk'))
 
+        # Filter by admin_address.
+        if 'admin_address' in param_keys:
+            queryset = queryset.filter(admin_address__iexact=self.request.query_params.get('admin_address'))
+
         # Filter by description.
         if 'description' in param_keys:
             queryset = queryset.filter(description__iexact=self.request.query_params.get('description'))

app/retail/templates/home/index2020.html

@@ -496,9 +496,7 @@ <h2>Legal</h2>
   <figure><a href="/fb"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#facebook"></use></svg></a></figure>
   <figure><a href="/youtube"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#youtube"></use></svg></a></figure>
   <figure><a href="/twitter"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#twitter"></use></svg></a></figure>
-  <figure><a href="/telegram"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#telegram"></use></svg></a></figure>
   <figure><a href="/github"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#github"></use></svg></a></figure>
-  <figure><a href="/chat"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#chat2"></use></svg></a></figure>
   <figure><a href="mailto:[email protected]"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#email"></use></svg></a></figure>
 
 

docs/API.md

@@ -188,7 +188,7 @@ The grants endpoint provides a listing of grants and all it's information. There
 
 **Filters**
 
-You can filter the data returned from the API by providing these keys as URL parameters `title`, `description`, `keyword`, `grant_type` and `pk` that takes an ID and returns a single grant.  You can also add a `limit` parameter to limit the results (typically for performance reasons).
+You can filter the data returned from the API by providing these keys as URL parameters `title`, `admin_address`, `description`, `keyword`, `grant_type` and `pk` that takes an ID and returns a single grant.  You can also add a `limit` parameter to limit the results (typically for performance reasons).
 
 
 #### Example Request