diff --git a/requirements.txt b/requirements.txt index 1bedaa1..c7924dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,6 @@ django-annoying django-bcrypt django-grappelli django-pagination -django-registration django-storages django-taggit django-tastypie @@ -22,3 +21,5 @@ pyyaml South uuid Werkzeug + +hg+ssh://hg@bitbucket.org/ubernostrum/django-registration#egg=django-registration diff --git a/snipt/settings.py b/snipt/settings.py index 5d1f861..1a9b3e0 100644 --- a/snipt/settings.py +++ b/snipt/settings.py @@ -178,6 +178,7 @@ LOGGING = { } # Email +DEFAULT_FROM_EMAIL = 'site@snipt.net' SERVER_EMAIL = 'site@snipt.net' EMAIL_BACKEND = 'postmark.django_backend.EmailBackend' POSTMARK_API_KEY = '608d3101-1706-4a96-819f-f2f36fe00fe0' diff --git a/snipt/urls.py b/snipt/urls.py index 7de6481..403e4e2 100644 --- a/snipt/urls.py +++ b/snipt/urls.py @@ -30,9 +30,10 @@ urlpatterns = patterns('', url(r'^api/', include(private_api.urls)), url(r'^signup/$', - 'registration.views.register', { - 'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_register'), + 'registration.views.register', { + 'backend': 'registration.backends.default.DefaultBackend' + }, + name='registration_register'), url(r'', include('registration.backends.default.urls')), url(r'^', include('snipts.urls')),