Merge b0858a6 into 951c050

unfoldingWord-dev · Feb 2, 2017 · c622102 · c622102
2 parents 951c050 + b0858a6
commit c622102
Show file tree

Hide file tree

Showing 58 changed files with 9 additions and 6,738 deletions.
diff --git a/td/gl_tracking/forms.py b/td/gl_tracking/forms.py
diff --git a/td/gl_tracking/models.py b/td/gl_tracking/models.py
@@ -6,7 +6,6 @@
 from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
 from django.db import models
-from django.core.urlresolvers import reverse
 
 
 # ----------- #
@@ -147,9 +146,6 @@ def save(self, *args, **kwargs):
             self.partner_start = datetime.date(1900, 1, 1)
         super(Partner, self).save(*args, **kwargs)
 
-    def get_absolute_url(self):
-        return reverse("gl:partner_detail_view", kwargs={"pk": self.pk})
-
 
 # ------------ #
 #    METHOD    #

diff --git a/td/gl_tracking/urls.py b/td/gl_tracking/urls.py
diff --git a/td/gl_tracking/views.py b/td/gl_tracking/views.py
diff --git a/td/settings.py b/td/settings.py
@@ -234,7 +234,6 @@
 EMAIL_FROM = "uwadmin@unfoldingword.org"
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
-# EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 
 ACCOUNT_OPEN_SIGNUP = False
 ACCOUNT_EMAIL_UNIQUE = True
@@ -275,8 +274,3 @@
         "key": os.environ.get("PORT_API_KEY"),
     }
 ]
-
-HOMEPAGE_MESSAGE = "The ability to create and update Languages, WA Regions, Countries, Charters, Events, and Partners " \
-                   "will be suspended for all users starting on Monday, Jan. 9, 2017. These functions will be made " \
-                   "available in the new system, which is launching in a couple of weeks. Please retain the " \
-                   "information you want to enter until then."
diff --git a/td/templates/gl_tracking/_language_doc_table.html b/td/templates/gl_tracking/_language_doc_table.html