Skip to content
Browse files

get rid of references to project contrib directory, add release notes

  • Loading branch information...
1 parent 5dc1b5f commit fb03dfd9b2bad2d6fc7b80b66d3fdb891f4ed8ca @visiblegovernment committed Oct 13, 2011
Showing with 30 additions and 6 deletions.
  1. +24 −0 RELEASE_NOTES
  2. +1 −1 mainapp/admin.py
  3. +3 −3 mainapp/models.py
  4. +2 −2 settings.py
View
24 RELEASE_NOTES
@@ -0,0 +1,24 @@
+RELEASE DEPENDENCIES
+
+HEAD
+====
+
+Head is currently running on Django-1.3.0. We hope to upgrade
+to Django-1.3.1 shortly.
+
+django-1.3.0
+django-stdimage
+django-transmeta
+django-google-analytics - optional
+django-registration
+django-social-auth
+
+
+VERSION 1.1.0
+==============
+
+django-1.1
+django-stdimage (contrib)
+django-transmeta (contrib)
+django-google-analytics (contrib) - optional
+
View
2 mainapp/admin.py
@@ -1,6 +1,6 @@
from fixmystreet.mainapp.models import UserProfile,EmailRule,Ward,ReportCategory,City, ReportCategoryClass, FaqEntry, Councillor,ReportCategorySet
from django.contrib import admin
-from contrib.transmeta import canonical_fieldname
+from transmeta import canonical_fieldname
from django import forms
admin.site.register(City)
View
6 mainapp/models.py
@@ -14,8 +14,8 @@
from datetime import datetime as dt
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy, ugettext as _
-from contrib.transmeta import TransMeta
-from contrib.stdimage import StdImageField
+from transmeta import TransMeta
+from stdimage import StdImageField
from django.utils.encoding import iri_to_uri
from django.template.defaultfilters import slugify
from django.contrib.gis.geos import fromstr
@@ -29,7 +29,7 @@ def __init__(self, subject='', body='', from_email=None, to=None, cc=None,
bcc=None, connection=None, attachments=None, headers=None):
super(CCEmailMessage, self).__init__(subject, body, from_email, to,
bcc, connection, attachments, headers)
- if cc:
+ if csc:
self.cc = list(cc)
else:
self.cc = []
View
4 settings.py
@@ -96,8 +96,8 @@
'django.contrib.sites',
'django.contrib.gis',
'registration',
- 'contrib.google_analytics',
- 'contrib.transmeta',
+ 'google_analytics',
+ 'transmeta',
'social_auth',
'mainapp',
)

0 comments on commit fb03dfd

Please sign in to comment.
Something went wrong with that request. Please try again.