diff options
| author | Madhusudan.C.S | 2010-11-18 16:16:28 +0530 |
|---|---|---|
| committer | Madhusudan.C.S | 2010-11-18 16:16:28 +0530 |
| commit | ec077a68e71ad95a94c76dabf0582ee1052f8278 (patch) | |
| tree | 91134b292c514f6866b4948c488fb5f232716c06 /project/urls.py | |
| parent | 8ded26d78f5e66132cf54292a2138b1a080a0564 (diff) | |
| parent | d6ea90a603cc63df5d150cd9bd99f72153169ea5 (diff) | |
| download | scipycon-ec077a68e71ad95a94c76dabf0582ee1052f8278.tar.gz scipycon-ec077a68e71ad95a94c76dabf0582ee1052f8278.tar.bz2 scipycon-ec077a68e71ad95a94c76dabf0582ee1052f8278.zip | |
Merge payments branch with the default mainline branch.
--HG--
branch : payments
Diffstat (limited to 'project/urls.py')
| -rw-r--r-- | project/urls.py | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/project/urls.py b/project/urls.py index 2d12b34..9d1530e 100644 --- a/project/urls.py +++ b/project/urls.py @@ -73,7 +73,9 @@ urlpatterns += patterns('project.scipycon.user.views', 'edit_profile', name='scipycon_edit_profile'), url(r'^%s/get-usernames/$' % (SCOPE_ARG_PATTERN), 'get_usernames', name='scipycon_get_usernames'), - ) + url(r'^%s/get-user-dump/$' % (SCOPE_ARG_PATTERN), + 'get_user_dump', name='scipycon_get_usernames')) + # Proceedings urlpatterns += patterns('project.scipycon.proceedings.views', @@ -108,12 +110,12 @@ urlpatterns += patterns('', url(r'^%s/talks-cfp/schedule/$' % (SCOPE_ARG_PATTERN), direct_to_template, {"template": "talk/schedule.html"}, name='scipycon_schedule'), - url(r'^%s/talks-cfp/tutorial/$' % (SCOPE_ARG_PATTERN), - direct_to_template, {"template": "talk/tutorial-schedule.html"}, - name='scipycon_tutorial_schedule'), - url(r'^%s/talks-cfp/sprint/$' % (SCOPE_ARG_PATTERN), - direct_to_template, {"template": "talk/sprint-schedule.html"}, - name='scipycon_sprint_schedule'), + # url(r'^%s/talks-cfp/tutorial/$' % (SCOPE_ARG_PATTERN), + # direct_to_template, {"template": "talk/tutorial-schedule.html"}, + # name='scipycon_tutorial_schedule'), + # url(r'^%s/talks-cfp/sprint/$' % (SCOPE_ARG_PATTERN), + # direct_to_template, {"template": "talk/sprint-schedule.html"}, + # name='scipycon_sprint_schedule'), url(r'^%s/talks-cfp/speakers/$' % (SCOPE_ARG_PATTERN), direct_to_template, {"template": "talk/speakers.html"}, name='scipycon_speakers'), @@ -126,6 +128,18 @@ urlpatterns += patterns('', url(r'^%s/organizers/$' % (SCOPE_ARG_PATTERN), direct_to_template, {"template": "about/organizers.html"}, name='scipycon_organizers'), + url(r'^%s/talks-cfp/conference/$' % (SCOPE_ARG_PATTERN), + direct_to_template, {"template": "talk/conf_schedule.html"}, + name='scipycon_conference'), + url(r'^%s/tutorial/$' % (SCOPE_ARG_PATTERN), + direct_to_template, {"template": "about/tutorial.html"}, + name='scipycon_tutorial'), + url(r'^%s/sprints/$' % (SCOPE_ARG_PATTERN), + direct_to_template, {"template": "about/sprints.html"}, + name='scipycon_sprints'), + url(r'^%s/certificates/$' % (SCOPE_ARG_PATTERN), + direct_to_template, {"template": "about/certificates.html"}, + name='scipycon_certificates'), ) |