X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/73bfc6b53448f5f1d10d9b3f58f2cf4f3756be41..c93d6d97601a8a01e3230c543113613309c81cb2:/cas_provider/urls.py?ds=inline

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 16a6744..a2f5fe7 100644
--- a/cas_provider/urls.py
+++ b/cas_provider/urls.py
@@ -1,9 +1,13 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns('cas_provider.views',
+    url(r'^login/merge/', 'login', {'merge': True, 'template_name': 'cas/merge.html'}),
     url(r'^login/?$', 'login', name='cas_login'),
+    url(r'^socialauth-login/$', 'login', name='cas_socialauth_login'),
     url(r'^validate/?$', 'validate', name='cas_validate'),
+    url(r'^proxy/?$', 'proxy', name='proxy'),
     url(r'^serviceValidate/?$', 'service_validate', name='cas_service_validate'),
+    url(r'^proxyValidate/?$', 'proxy_validate', name='cas_proxy_validate'),
     url(r'^logout/?$', 'logout', name='cas_logout'),
 )