Merge branch 'master' into dev

breccia_mapper/settings.py

@@ -134,6 +134,16 @@ DBBACKUP_STORAGE_OPTIONS = {
 }
 
 
+# Django REST Framework
+# https://www.django-rest-framework.org/
+
+REST_FRAMEWORK = {
+    'DEFAULT_PERMISSION_CLASSES': [
+        'rest_framework.permissions.IsAuthenticated',
+    ],
+}
+
+
 # Password validation
 # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
 

breccia_mapper/templates/base.html

@@ -73,6 +73,10 @@
                             <a href="{% url 'activities:activity.list' %}" class="nav-link">Activities</a>
                         </li>
 
+                        <li class="nav-item">
+                            <a href="{% url 'people:network' %}" class="nav-link">Network</a>
+                        </li>
+
                         {% if request.user.is_superuser %}
                             <li class="nav-item">
                                 <a href="{% url 'admin:index' %}" class="nav-link">Admin</a>