# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1415979929 -3600
# Node ID b2f427c437beafa94b1e4cd84ee42034cafd5406
# Parent  5d6d75e21634f525ea357aaec91ff27e9ec3aa3e
Register users for admin
improve url for resetting password

diff -r 5d6d75e21634 -r b2f427c437be .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Fri Nov 14 13:04:22 2014 +0100
+++ b/.settings/org.eclipse.core.resources.prefs	Fri Nov 14 16:45:29 2014 +0100
@@ -45,6 +45,7 @@
 encoding//src/hdalab/migrations/0006_dbpedia_fields_one_to_one.py=utf-8
 encoding//src/hdalab/migrations/0007_geographic_inclusion.py=utf-8
 encoding//src/hdalab/migrations/0008_datasheet_insee.py=utf-8
+encoding//src/hdalab/migrations/0011_auto__add_field_dbpediafieldstranslation_is_label_translated__add_fiel.py=utf-8
 encoding//src/hdalab/migrations/0012_auto__add_hdalabrenkan.py=utf-8
 encoding//src/hdalab/models/dataviz.py=utf-8
 encoding//src/hdalab/settings.py=utf-8
diff -r 5d6d75e21634 -r b2f427c437be src/hdabo/admin.py
--- a/src/hdabo/admin.py	Fri Nov 14 13:04:22 2014 +0100
+++ b/src/hdabo/admin.py	Fri Nov 14 16:45:29 2014 +0100
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from hdabo.models import (Author, Datasheet, DocumentFormat, Domain, Organisation, 
-    Tag, TagCategory, TaggedSheet, TimePeriod)
+    Tag, TagCategory, TaggedSheet, TimePeriod, User)
 
 
 admin.site.register(Author)
@@ -12,5 +12,6 @@
 admin.site.register(TagCategory)
 admin.site.register(TaggedSheet)
 admin.site.register(TimePeriod)
+admin.site.register(User)
 
 
diff -r 5d6d75e21634 -r b2f427c437be src/hdabo/urls.py
--- a/src/hdabo/urls.py	Fri Nov 14 13:04:22 2014 +0100
+++ b/src/hdabo/urls.py	Fri Nov 14 16:45:29 2014 +0100
@@ -18,7 +18,7 @@
 
     # Uncomment the next line to enable the admin:
     url(r'^accounts/', include(auth_url)),
-    url(r'^accounts/password/reset/confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', auth_views.password_reset_confirm, name='password_reset_confirm'),
+    url(r'^accounts/password/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', auth_views.password_reset_confirm, name='auth_password_reset_confirm'),
     url(r'^accounts/', include('registration.backends.default.urls')),
     url(r'^logout/', 'django.contrib.auth.views.logout_then_login'),
     url(r'^admin/', include(admin.site.urls)),