diff options
| author | Jayaram Pai | 2014-04-19 18:12:57 +0530 |
|---|---|---|
| committer | Jayaram Pai | 2014-04-19 18:12:57 +0530 |
| commit | 1f0b55a3e1500660945f0702aa00c90a23ca4d95 (patch) | |
| tree | 5ae3d6615149261115dbf3ebc5155db5267d8fe7 /website/urls.py | |
| parent | bf734e04b25ca97c897f431af8ac9966279337f5 (diff) | |
| parent | 2fbf3ecf6cae63691380ec8cc9df2c4beff29dae (diff) | |
| download | FOSSEE-Forum-1f0b55a3e1500660945f0702aa00c90a23ca4d95.tar.gz FOSSEE-Forum-1f0b55a3e1500660945f0702aa00c90a23ca4d95.tar.bz2 FOSSEE-Forum-1f0b55a3e1500660945f0702aa00c90a23ca4d95.zip | |
fixed merge conflict
Diffstat (limited to 'website/urls.py')
| -rw-r--r-- | website/urls.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/website/urls.py b/website/urls.py index 9288e1e..75a9dbc 100644 --- a/website/urls.py +++ b/website/urls.py @@ -3,7 +3,8 @@ from django.conf.urls import patterns, include, url urlpatterns = patterns('', url(r'^$', 'website.views.home', name='home'), url(r'^question/(?P<question_id>\d+)/$', 'website.views.get_question', name='get_question'), - url(r'^question-reply/$', 'website.views.question_reply', name='question_reply'), + url(r'^question-answer/$', 'website.views.question_answer', name='question_answer'), + url(r'^answer-comment/$', 'website.views.answer_comment', name='answer_comment'), url(r'^filter/(?P<category>[^/]+)/$', 'website.views.filter', name='filter'), url(r'^filter/(?P<category>[^/]+)/(?P<tutorial>[^/]+)/$', 'website.views.filter', name='filter'), url(r'^filter/(?P<category>[^/]+)/(?P<tutorial>[^/]+)/(?P<minute_range>[^/]+)/$', 'website.views.filter', name='filter'), @@ -11,7 +12,7 @@ urlpatterns = patterns('', url(r'^new-question/$', 'website.views.new_question', name='new_question'), url(r'^user/(?P<user_id>\d+)/notifications/$', 'website.views.user_notifications', name='user_notifications'), url(r'^user/(?P<user_id>\d+)/questions/$', 'website.views.user_questions', name='user_questions'), - url(r'^user/(?P<user_id>\d+)/replies/$', 'website.views.user_replies', name='user_replies'), + url(r'^user/(?P<user_id>\d+)/answers/$', 'website.views.user_answers', name='user_answers'), url(r'^clear-notifications/$', 'website.views.clear_notifications', name='clear_notifications'), url(r'^search/$', 'website.views.search', name='search'), @@ -20,7 +21,8 @@ urlpatterns = patterns('', url(r'^ajax-duration/$', 'website.views.ajax_duration', name='ajax_duration'), url(r'^ajax-question-update/$', 'website.views.ajax_question_update', name='ajax_question_update'), url(r'^ajax-details-update/$', 'website.views.ajax_details_update', name='ajax_details_update'), - url(r'^ajax-reply-update/$', 'website.views.ajax_reply_update', name='ajax_reply_update'), + url(r'^ajax-answer-update/$', 'website.views.ajax_answer_update', name='ajax_answer_update'), + url(r'^ajax-answer-comment-update/$', 'website.views.ajax_answer_comment_update', name='ajax_answer_comment_update'), url(r'^ajax-similar-questions/$', 'website.views.ajax_similar_questions', name='ajax_similar_questions'), url(r'^ajax-notification-remove/$', 'website.views.ajax_notification_remove', name='ajax_notification_remove'), url(r'^ajax-keyword-search/$', 'website.views.ajax_keyword_search', name='ajax_keyword_search'), |