Merge branch 'master' into revision-view

This commit is contained in:
David Taylor
2015-05-24 12:24:21 +01:00
10 changed files with 234 additions and 96 deletions

View File

@@ -4,6 +4,7 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.conf import settings
from registration.backends.default.views import RegistrationView
import RIGS
from RIGS import regbackend
urlpatterns = patterns('',
# Examples:
@@ -12,7 +13,7 @@ urlpatterns = patterns('',
url(r'^', include('RIGS.urls')),
url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail),
name="registration_register"),
name="registration_register"),
url('^user/', include('django.contrib.auth.urls')),
url('^user/', include('registration.backends.default.urls')),