caminus/caminus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the remanants of the profiles app into the local app for more caminus-only bits

Browse Source
This commit is contained in:
Trever Fischer
2012-03-10 19:14:19 -05:00
parent 77314a81e7
commit 8ee0ce3365
25 changed files with 284 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
urls.py
View File

@@ -11,14 +11,14 @@ urlpatterns = patterns('',
url(r'^news/', include('news.urls')),
url(r'^minecraft/', include('minecraft.urls')),
url(r'^mail/', include('messages.urls')),
url(r'^profiles/', include('profiles.urls')),
url(r'^profiles/', include('local.urls')),
url(r'^accounts/logout', 'django.contrib.auth.views.logout', kwargs={'next_page':'/'}),
url(r'^accounts/', include('django.contrib.auth.urls')),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/', include(admin.site.urls)),
url(r'^forums/', include('forums.urls')),
url(r'^api/', include('api.urls')),
url(r'^i/(?P<code>.+)', 'profiles.views.claimInvite')
url(r'^i/(?P<code>.+)', 'local.views.claimInvite')
)
urlpatterns += staticfiles_urlpatterns()