xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-sxw' of https://git.coding.net/virusdefender/qduoj

Browse Source 
Conflicts:
	contest/views.py
	template/src/oj/contest/contest_rank.html
	template/src/oj/contest/submissions_list.html
This commit is contained in:
sxw@401
2015-09-15 13:18:36 +08:00
parent 0f6c822aff 5066a39312
commit befad67dbf
48 changed files with 1117 additions and 2892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/views.py
View File

@@ -29,8 +29,8 @@ class SimditorImageUploadAPIView(APIView):
return Response(data={
"success": True,
"msg": "上传错误",
"file_path": "/static/upload_image/" + image_name})
"file_path": "/static/upload/" + image_name})
return Response(data={
"success": True,
"msg": "",
"file_path": "/static/upload_image/" + image_name})
"file_path": "/static/upload/" + image_name})