Merge branch 'release-4.2'

gobotany/editor/templates/gobotany/edit_pile_taxon.html

@@ -10,7 +10,7 @@
 
 <p>
   ← return to pile <a href="..">{{ pile.slug }}</a><br>
-  → visit this plant in the <a href="/admin/core/taxon/{{ taxon.id }}"
+  → visit this plant in the <a href="/admin/core/taxon/{{ taxon.id }}/"
                                >admin interface</a>
 </p>
 

gobotany/site/templates/gobotany/_base.html

@@ -9,7 +9,15 @@
 
         <link rel="canonical" href="https://gobotany.nativeplanttrust.org{{ request.path }}">
 
-        <link rel="shortcut icon" href="/static/images/branding/favicon.png">
+        <link rel="apple-touch-icon" sizes="180x180"
+            href="/static/images/branding/gb-apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32"
+            href="/static/images/branding/gb-favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16"
+            href="/static/images/branding/gb-favicon-16x16.png">
+        <link rel="mask-icon"
+            href="/static/images/branding/gb-safari-pinned-tab.svg"
+            color="#5bbad5">
 
         {# Unless this is the Production site, ask not to be indexed. #}
         {% if 'gobotany.nativeplanttrust.org' not in request.META.HTTP_HOST %}

gobotany/templates/admin/base_site.html

@@ -0,0 +1,13 @@
+{% extends "admin/base_site.html" %}
+
+{% block extrahead %}
+    <link rel="apple-touch-icon" sizes="180x180"
+        href="/static/images/branding/gb-admin-apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32"
+        href="/static/images/branding/gb-admin-favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16"
+        href="/static/images/branding/gb-admin-favicon-16x16.png">
+    <link rel="mask-icon"
+        href="/static/images/branding/gb-admin-safari-pinned-tab.svg"
+        color="#5bbad5">
+{% endblock %}

gobotany/version.py

@@ -3,4 +3,4 @@ def get_version():
 	"""Simple function to return a version number. Hardcoded for the 
 	moment. """
 
-	return "4.1"
+	return "4.2"

setup.py

@@ -2,7 +2,7 @@
 from setuptools import find_packages
 
 requirements = [
-    'django==4.0',
+    'django==4.0.10',
 
     'Pillow==10.3.0',
     'bleach==5.0.1',
@@ -40,6 +40,7 @@
 
     'django-registration==3.3',
     'django-user-accounts==3.2.0', # for changing email addresses
+                                          # (directory is /account/)
 
     # For storing images on S3.