Merge branch 'master' into country-list-fix

MozillaFoundation · Jul 3, 2018 · 3f62022 · 3f62022
2 parents fbe3811 + 3b4c7f4
commit 3f62022
Show file tree

Hide file tree

Showing 10 changed files with 641 additions and 686 deletions.
diff --git a/Pipfile b/Pipfile
@@ -8,7 +8,7 @@ Django = "==1.11.13"
 gunicorn = "*"
 djangorestframework = "*"
 django-filter = "*"
-Mezzanine = {git = "https://github.com/stephenmcd/mezzanine@521a98c39bb6351c4b46067069f33caf95fe0a5e", editable=true}
+Mezzanine = {git = "https://github.com/stephenmcd/mezzanine@521a98c39bb6351c4b46067069f33caf95fe0a5e"}
 "filebrowser-s3" = "*"
 wagtail = "*"
 wagtail-metadata = "*"
@@ -27,7 +27,7 @@ django-admin-sortable = "*"
 requests = "*"
 factory_boy = "*"
 Faker = "*"
-wagtail-factories = {git = "https://github.com/mvantellingen/wagtail-factories@1ead51cadaad3b4530ba2197ccf45d2dca87dbdf", editable=true}
+wagtail-factories = {git = "https://github.com/mvantellingen/wagtail-factories@1ead51cadaad3b4530ba2197ccf45d2dca87dbdf"}
 
 [dev-packages]
 coverage = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/network-api/networkapi/templates/404.html b/network-api/networkapi/templates/404.html
@@ -1,4 +1,4 @@
-{% extends "pages/base-compiled.html" %} {% load wagtailcore_tags wagtailimages_tags %}
+{% extends "pages/base.html" %} {% load wagtailcore_tags wagtailimages_tags %}
 
 {% block bodyID %}404{% endblock%}
 

diff --git a/...orkapi/templates/pages/base-compiled.html → ...-api/networkapi/templates/pages/base.html b/...orkapi/templates/pages/base-compiled.html → ...-api/networkapi/templates/pages/base.html
diff --git a/network-api/networkapi/templates/pages/campaign-opportunity-base.html b/network-api/networkapi/templates/pages/campaign-opportunity-base.html
@@ -1,4 +1,4 @@
-{% extends "./base-compiled.html" %}
+{% extends "./base.html" %}
 
 {% block bodyID %}{{ suffix }}{% endblock %}
 

diff --git a/network-api/networkapi/templates/pages/fellowships.html b/network-api/networkapi/templates/pages/fellowships.html
@@ -1,4 +1,4 @@
-{% extends "./base-compiled.html" %}
+{% extends "./base.html" %}
 
 {% load fellowship_active_nav %}
 

diff --git a/network-api/networkapi/wagtailpages/models.py b/network-api/networkapi/wagtailpages/models.py
@@ -85,7 +85,7 @@ class ModularPage(MetadataPageMixin, Page):
 
     # Legacy field for now, necessary to make sure that the
     # actualy <title> element has the correct value in it.
-    # This uses page.meta_title in the base-compiled.html
+    # This uses page.meta_title in the base.html
     # master template, which is still based on Mezzanine
     # page models, rather than Wagtail pages models.
     @property

diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/homepage.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/homepage.html
@@ -1,4 +1,4 @@
-{% extends "pages/base-compiled.html" %}
+{% extends "pages/base.html" %}
 {% load wagtailcore_tags wagtailimages_tags homepage_tags wagtailmetadata_tags %}
 
 {% block bodyID %}home{% endblock %}

diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/modular_page.html
@@ -1,4 +1,4 @@
-{% extends "pages/base-compiled.html" %}
+{% extends "pages/base.html" %}
 
 {% load wagtailcore_tags mini_site_tags wagtailmetadata_tags %}
 

diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-python-3.6.4
+python-3.6.5