diff options
author | adityacp | 2020-09-09 09:34:54 +0530 |
---|---|---|
committer | adityacp | 2020-09-09 09:34:54 +0530 |
commit | 196e5df3930d4c3f18dfd7e33c9821ca2f74a51e (patch) | |
tree | 4039d736e24c75177682d4ce7299057e29f17d4d /yaksh/urls.py | |
parent | 2d1b8eb907c7e142d4e3c76e43707fb9f82d6683 (diff) | |
parent | 23bf46ac2e262ceb373388196962a0bec048c6cb (diff) | |
download | online_test-196e5df3930d4c3f18dfd7e33c9821ca2f74a51e.tar.gz online_test-196e5df3930d4c3f18dfd7e33c9821ca2f74a51e.tar.bz2 online_test-196e5df3930d4c3f18dfd7e33c9821ca2f74a51e.zip |
Resolve conflicts
Diffstat (limited to 'yaksh/urls.py')
-rw-r--r-- | yaksh/urls.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/yaksh/urls.py b/yaksh/urls.py index d7fd410..e4f81e1 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -237,6 +237,15 @@ urlpatterns = [ views.mark_notification, name="mark_notification"), path('mark/notifications', views.mark_notification, name="mark_notification"), + url(r'^manage/micromanager/allow_special_attempt/(?P<user_id>\d+)/' + '(?P<course_id>\d+)/(?P<quiz_id>\d+)/$', + views.allow_special_attempt, name='allow_special_attempt'), + url(r'^micromanager/special_start/(?P<micromanager_id>\d+)/$', + views.special_start, name='special_start'), + url(r'^manage/micromanager/special_revoke/(?P<micromanager_id>\d+)/$', + views.revoke_special_attempt, name='revoke_special_attempt'), + url(r'^manage/extend_time/(?P<paper_id>\d+)/$', + views.extend_time, name='extend_time'), path('manage/add/marker/<int:course_id>/<int:lesson_id>', views.add_marker, name='add_marker'), path('manage/add/lesson/topic/<int:content_type>/<int:course_id>/<int:lesson_id>', |