Merge branch 'dev' into hohoTT-dev

This commit is contained in:
hohoTT
2015-08-21 18:19:01 +08:00
22 changed files with 4271 additions and 151 deletions

View File

@@ -17,6 +17,7 @@ from admin.views import AdminTemplateView
from problem.views import TestCaseUploadAPIView, ProblemTagAdminAPIView, ProblemAdminAPIView
from submission.views import SubmissionAPIView, SubmissionAdminAPIView
from monitor.views import QueueLengthMonitorAPIView
urlpatterns = [
@@ -62,5 +63,6 @@ urlpatterns = [
name="join_group_request_admin_api"),
url(r'^api/submission/$', SubmissionAPIView.as_view(), name="submission_api"),
url(r'^api/admin/submission/$', SubmissionAdminAPIView.as_view(), name="submission_admin_api_view"),
url(r'^api/admin/monitor/$', QueueLengthMonitorAPIView.as_view(), name="queue_length_monitor_api"),
]