From d53feb82cdd74e25045171acf70e513729ba993c Mon Sep 17 00:00:00 2001
From: adityacp
Date: Fri, 15 Apr 2016 11:40:25 +0530
Subject: rebase changes

---
 yaksh/urls.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index b32bc36..4e72084 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -74,6 +74,7 @@ urlpatterns += [
         views.enroll, {'was_rejected': True}),
     url(r'manage/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.reject),
     url(r'manage/enrolled/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
+
         views.reject, {'was_enrolled': True}),
     url(r'manage/toggle_status/(?P<course_id>\d+)/$', views.toggle_course_status),
     url(r'^ajax/questionpaper/(?P<query>.+)/$', views.ajax_questionpaper),
@@ -89,4 +90,8 @@ urlpatterns += [
     url(r'^manage/addteacher/(?P<course_id>\d+)/$', views.add_teacher),
     url(r'^manage/allotted_course/$', views.allotted_courses),
     url(r'^manage/remove_teachers/(?P<course_id>\d+)/$', views.remove_teachers)
+    url(r'^manage/download_questions/$', views.download_questions),
+    url(r'^manage/upload_questions/$', views.upload_questions)
 ]
+
+    
-- 
cgit 


From b74128df59de974032d630a267a15e7d0c91a593 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Fri, 15 Apr 2016 12:37:59 +0530
Subject: models testcase changes

---
 yaksh/urls.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 4e72084..533a6f9 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -74,7 +74,6 @@ urlpatterns += [
         views.enroll, {'was_rejected': True}),
     url(r'manage/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.reject),
     url(r'manage/enrolled/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
-
         views.reject, {'was_enrolled': True}),
     url(r'manage/toggle_status/(?P<course_id>\d+)/$', views.toggle_course_status),
     url(r'^ajax/questionpaper/(?P<query>.+)/$', views.ajax_questionpaper),
-- 
cgit 


From 2f7891874aec1dec962d55e3b2aaed1c61d7acaa Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 4 May 2016 22:55:19 +0530
Subject: rebase changes and changes as per comments

---
 yaksh/urls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 533a6f9..f660ed7 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -88,9 +88,9 @@ urlpatterns += [
     url(r'^manage/searchteacher/(?P<course_id>\d+)/$', views.search_teacher),
     url(r'^manage/addteacher/(?P<course_id>\d+)/$', views.add_teacher),
     url(r'^manage/allotted_course/$', views.allotted_courses),
-    url(r'^manage/remove_teachers/(?P<course_id>\d+)/$', views.remove_teachers)
+    url(r'^manage/remove_teachers/(?P<course_id>\d+)/$', views.remove_teachers),
     url(r'^manage/download_questions/$', views.download_questions),
-    url(r'^manage/upload_questions/$', views.upload_questions)
+    url(r'^manage/upload_questions/$', views.show_all_questions)
 ]
 
     
-- 
cgit 


From a2d3d14e03c7f6a873b4f838752878d2bcab44aa Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 5 May 2016 12:52:47 +0530
Subject: changes for download questions

---
 yaksh/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index f660ed7..18a64c2 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -89,7 +89,7 @@ urlpatterns += [
     url(r'^manage/addteacher/(?P<course_id>\d+)/$', views.add_teacher),
     url(r'^manage/allotted_course/$', views.allotted_courses),
     url(r'^manage/remove_teachers/(?P<course_id>\d+)/$', views.remove_teachers),
-    url(r'^manage/download_questions/$', views.download_questions),
+    url(r'^manage/download_questions/$', views.show_all_questions),
     url(r'^manage/upload_questions/$', views.show_all_questions)
 ]
 
-- 
cgit