Files
@ a88485b46fb9
Branch filter:
Location: symposion_app/symposion_project/urls.py - annotation
a88485b46fb9
843 B
text/x-python
Merge branch 'fresh-start' into sponsorship
Conflicts:
symposion_project/docs/index.rst
Conflicts:
symposion_project/docs/index.rst
0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf | from django.conf import settings
from django.conf.urls.defaults import *
from django.views.generic.simple import direct_to_template
from django.contrib import admin
admin.autodiscover()
from pinax.apps.account.openid_consumer import PinaxConsumer
handler500 = "pinax.views.server_error"
urlpatterns = patterns("",
url(r"^$", direct_to_template, {
"template": "homepage.html",
}, name="home"),
url(r"^admin/invite_user/$", "pinax.apps.signup_codes.views.admin_invite_user", name="admin_invite_user"),
url(r"^admin/", include(admin.site.urls)),
url(r"^about/", include("about.urls")),
url(r"^account/", include("pinax.apps.account.urls")),
url(r"^openid/", include(PinaxConsumer().urls)),
)
if settings.SERVE_MEDIA:
urlpatterns += patterns("",
url(r"", include("staticfiles.urls")),
)
|