Files
@ 637921628e6f
Branch filter:
Location: symposion_app/symposion_project/urls.py - annotation
637921628e6f
1017 B
text/x-python
Merge branch 'fresh-start' into cms-features
* fresh-start:
update theme
fixed coding convention nits
internationalized the sponsor model fields
Makes conference app fields and models localizable
added documentation for conference models
made sponsorship app conference-aware
initial documentation of sponsorship app
added sponsorship template tags and template fragments; improved admin
fixed incorrect module name in import
initial sponsorship app adapted from DjangoCon
Conflicts:
symposion_project/requirements/base.txt
symposion_project/settings.py
* fresh-start:
update theme
fixed coding convention nits
internationalized the sponsor model fields
Makes conference app fields and models localizable
added documentation for conference models
made sponsorship app conference-aware
initial documentation of sponsorship app
added sponsorship template tags and template fragments; improved admin
fixed incorrect module name in import
initial sponsorship app adapted from DjangoCon
Conflicts:
symposion_project/requirements/base.txt
symposion_project/settings.py
0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf d0be075c89c6 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf 0f6843b08dcf d0be075c89c6 d0be075c89c6 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"
WIKI_SLUG = r"(([\w-]{2,})(/[\w-]{2,})*)"
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)),
url(r"^markitup/", include("markitup.urls")),
url(r"^pages/(?P<slug>%s)/$" % WIKI_SLUG, "cms.views.page", name="cms_page"),
)
if settings.SERVE_MEDIA:
urlpatterns += patterns("",
url(r"", include("staticfiles.urls")),
)
|