# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1396397761 -7200
# Node ID 3368f480039bd631b81725b5d3b6151564e87ad2
# Parent  0ed5a088fdf4daae95231bd8bd6894370181b65e
corrcet problems with django-registration and django 1.6

diff -r 0ed5a088fdf4 -r 3368f480039b src/egonomy/__init__.py
--- a/src/egonomy/__init__.py	Wed Apr 02 01:53:48 2014 +0200
+++ b/src/egonomy/__init__.py	Wed Apr 02 02:16:01 2014 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 9, 2, "final", 0)
+VERSION = (0, 9, 3, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 0ed5a088fdf4 -r 3368f480039b src/egonomy/auth/urls.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/egonomy/auth/urls.py	Wed Apr 02 02:16:01 2014 +0200
@@ -0,0 +1,30 @@
+from django.conf.urls import patterns, url, include
+from django.contrib.auth import views as auth_views
+
+
+urlpatterns = patterns('',
+
+      #override the default urls
+      url(r'^password/change/$',
+                    auth_views.password_change,
+                    name='password_change'),
+      url(r'^password/change/done/$',
+                    auth_views.password_change_done,
+                    name='password_change_done'),
+      url(r'^password/reset/$',
+                    auth_views.password_reset,
+                    name='password_reset'),
+      url(r'^password/reset/done/$',
+                    auth_views.password_reset_done,
+                    name='password_reset_done'),
+      url(r'^password/reset/complete/$',
+                    auth_views.password_reset_complete,
+                    name='password_reset_complete'),
+      url(r'^password/reset/confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
+                    auth_views.password_reset_confirm,
+                    name='password_reset_confirm'),
+
+      #and now add the registration urls
+      url(r'', include('registration.backends.default.urls')),
+      
+)
\ No newline at end of file
diff -r 0ed5a088fdf4 -r 3368f480039b src/egonomy/urls.py
--- a/src/egonomy/urls.py	Wed Apr 02 01:53:48 2014 +0200
+++ b/src/egonomy/urls.py	Wed Apr 02 02:16:01 2014 +0200
@@ -42,7 +42,7 @@
     url(r'^ajax-login/', 'egonomy.views.ajax_login', name='ajax_login'),
     url(r'^check-egonomy-token/(?P<token>[\w\d\-_=]*)$', 'egonomy.views.check_egonomy_token', name='check_egonomy_token'),
     (r'^api/', include('egonomy.api.urls')),
-    (r'^accounts/', include('registration.backends.default.urls')),
+    (r'^accounts/', include('egonomy.auth.urls')),
 )
 urlpatterns += staticfiles_urlpatterns()
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file