From 5d92e6fac7901c9829a759aec539e603dfb66038 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 26 Apr 2016 19:00:01 +0530
Subject: rebase changes

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

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 471a36b..9554750 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -85,4 +85,7 @@ urlpatterns += [
         views.enroll, {'was_rejected': True}),
     url(r'manage/enrolled/reject/(?P<course_id>\d+)/$',
         views.reject, {'was_enrolled': True})
+    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/viewcourse/$', views.view_courses)
 ]
-- 
cgit 


From fa11260fdbe76f377909483d9c482ecf72ab3364 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 21 Apr 2016 18:57:28 +0530
Subject: changes in add teachers as per comments

---
 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 9554750..7f42faf 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -84,7 +84,7 @@ urlpatterns += [
     url(r'manage/enroll/rejected/(?P<course_id>\d+)/$',
         views.enroll, {'was_rejected': True}),
     url(r'manage/enrolled/reject/(?P<course_id>\d+)/$',
-        views.reject, {'was_enrolled': True})
+        views.reject, {'was_enrolled': True}),
     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/viewcourse/$', views.view_courses)
-- 
cgit 


From 6b09383890b8367628124a854810326d7bbac7c4 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 27 Apr 2016 16:42:32 +0530
Subject: changes after comments

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

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 7f42faf..1716818 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -87,5 +87,6 @@ urlpatterns += [
         views.reject, {'was_enrolled': True}),
     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/viewcourse/$', views.view_courses)
+    url(r'^manage/viewcourse/$', views.view_courses),
+    url(r'^manage/remove_teachers/(?P<course_id>\d+)/$', views.remove_teachers)
 ]
-- 
cgit 


From 3438ca95172897b594c216967d51cf5771d75f73 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 28 Apr 2016 12:22:30 +0530
Subject: further commented changes

---
 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 1716818..ea1922d 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -87,6 +87,6 @@ urlpatterns += [
         views.reject, {'was_enrolled': True}),
     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/viewcourse/$', views.view_courses),
+    url(r'^manage/allotted_course/$', views.allotted_courses),
     url(r'^manage/remove_teachers/(?P<course_id>\d+)/$', views.remove_teachers)
 ]
-- 
cgit