Commit Graph

1177 Commits

Author SHA1 Message Date
virusdefender
a9f4b370cc Accept Merge Request #91 : (virusdefender-dev -> dev)
Merge Request: 修改判题数据库
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/91
2015-08-17 13:02:13 +08:00
virusdefender
07349ba6e2 Merge branch 'dev' into virusdefender-dev
* dev:
  ‰øƧ‰øÆÊîπ‰∫ÜÊ∑ªÂä†ÈóÆÈ¢òÈ°µÈù¢jsÂèòÈáèÂêç,Ê∑ªÂä†ÈóÆÈ¢òÂäüËÉΩÊ≠£Â∏∏[CI SKIP]
  修改/oj/local_settings.py中的test_case上传路径,修复测试用例存储错误的bug

Conflicts:
	oj/local_settings.py
	template/admin/problem/add_problem.html
2015-08-17 13:01:43 +08:00
virusdefender
8571a4199a Accept Merge Request #90 : (dev-sxw -> dev)
Merge Request: 关于添加问题功能的修改
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/90
2015-08-17 12:59:52 +08:00
virusdefender
309eef710c 修改数据库地址 2015-08-17 12:58:13 +08:00
virusdefender
537da5d795 修改判题数据库 2015-08-17 12:48:10 +08:00
esp
bc18c1125c 修修改了添加问题页面js变量名,添加问题功能正常[CI SKIP] 2015-08-17 10:19:21 +08:00
esp
3226727703 修改/oj/local_settings.py中的test_case上传路径,修复测试用例存储错误的bug 2015-08-17 09:46:44 +08:00
hohoTT
d88dde18bb 替换掉商业版的 formvalidation 2015-08-16 20:53:18 +08:00
virusdefender
3f76df3079 Accept Merge Request #88 : (hohoTT-dev -> dev)
Merge Request: 修改problem中的测试及views
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/88
2015-08-16 18:34:39 +08:00
hohoTT
30348f0c5d 删除problem中多余的代码 2015-08-16 16:52:26 +08:00
hohoTT
277ee83b0f 修改problem中的测试及views 2015-08-16 14:28:09 +08:00
hohoTT
dc67491e6e Merge branch 'dev' into hohoTT-dev 2015-08-16 14:20:31 +08:00
virusdefender
de25b6c218 Accept Merge Request #86 : (virusdefender-dev -> dev)
Merge Request: 替换掉商业版的 formvalidation
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/86
2015-08-16 12:16:08 +08:00
virusdefender
fbd109ccc1 增加判题的异常处理 2015-08-16 12:15:13 +08:00
virusdefender
83ad1e9f3c 替换掉商业版的 formvalidation 2015-08-16 12:14:56 +08:00
virusdefender
3f56e99f3c Accept Merge Request #84 : (virusdefender-dev -> dev)
Merge Request: 修改配置文件
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/84
2015-08-16 08:56:05 +08:00
virusdefender
a36268bcc8 修改配置项目 2015-08-16 08:47:03 +08:00
virusdefender
d5ab12bb32 修改代码格式 2015-08-15 23:46:52 +08:00
virusdefender
884d3ff980 避免硬编码网站信息 2015-08-15 23:46:40 +08:00
virusdefender
a6bd787b86 修改 celery 配置文件格式 2015-08-15 23:46:25 +08:00
hohoTT
aa99e9f634 修改并删除测试中不必要的东西 2015-08-15 20:56:39 +08:00
virusdefender
7e16a9feb8 修复 waiting 状态下颜色错误的问题 2015-08-15 20:40:54 +08:00
virusdefender
7eef07f0ca 增加对判题超时的提示 2015-08-15 20:38:53 +08:00
hohoTT
2437608915 Accept Merge Request #80 : (hohoTT-dev -> dev)
Merge Request: js与css部分的修改
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/80
2015-08-15 19:51:11 +08:00
hohoTT
e3756328af js与css部分的修改 2015-08-15 19:49:58 +08:00
virusdefender
b4d70d8ebd Accept Merge Request #79 : (virusdefender-dev -> dev)
Merge Request: 去除对 subprocess 的依赖
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/79
2015-08-15 17:52:26 +08:00
virusdefender
397927ef21 去除启动 docker 的超时 2015-08-15 17:52:07 +08:00
virusdefender
b49e571790 Merge branch 'dev' into virusdefender-dev
* dev:
2015-08-15 17:50:43 +08:00
virusdefender
272169c0c8 去除对 subprocess32的依赖 2015-08-15 17:49:51 +08:00
hohoTT
4518257f9d Accept Merge Request #78 : (virusdefender-dev -> dev)
Merge Request: 修改判题模块
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/78
2015-08-15 17:17:12 +08:00
virusdefender
5ab004638d 修复配置文件错误 2015-08-15 17:02:46 +08:00
virusdefender
088787443e 修改判题端配置文件 2015-08-15 17:00:55 +08:00
virusdefender
cb7dd2f820 修改判题的目录结构 2015-08-15 14:50:22 +08:00
virusdefender
025335b40a 修改 js 的命名风格 2015-08-15 13:54:30 +08:00
virusdefender
d031f14a68 增加了题目列表页 2015-08-14 16:38:31 +08:00
virusdefender
489bbb841a fix typo 2015-08-14 16:38:13 +08:00
virusdefender
4c9ffa40b0 Accept Merge Request #76 : (virusdefender-dev -> dev)
Merge Request: 修复一点小问题
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/76
2015-08-14 10:37:28 +08:00
virusdefender
a0613e0a75 更换 mongodb 设置写法 2015-08-14 10:36:48 +08:00
virusdefender
84b8d1e067 fix typo 2015-08-14 10:36:34 +08:00
virusdefender
174752b9b1 修复测试同名问题 2015-08-14 10:36:23 +08:00
virusdefender
fd07ff4666 Accept Merge Request #75 : (virusdefender-dev -> dev)
Merge Request: 完善提交代码判题和显示提交信息页面
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/75
2015-08-14 10:24:34 +08:00
virusdefender
59ee24de45 完善提交页面、提交列表和对应的后台逻辑 2015-08-14 10:23:06 +08:00
virusdefender
11a4c04443 统一使用 error_page 的形式返回错误页面 2015-08-14 10:22:32 +08:00
virusdefender
e84039eea1 增加逻辑判断用户名重复的问题 2015-08-14 10:21:50 +08:00
virusdefender
f3be10161f 修复错误的测试 url 名称修改导致 2015-08-14 10:21:22 +08:00
virusdefender
7f3044086f 更换 templatetags 目录 2015-08-14 10:21:02 +08:00
virusdefender
94282f3ed8 更新我的提交列表页面 2015-08-13 21:02:17 +08:00
virusdefender
58f9014688 修改题目前端样式 2015-08-13 20:29:11 +08:00
virusdefender
2731bc9249 修改 docker 运行时间配置 2015-08-13 20:28:41 +08:00
virusdefender
0aeeab3c8c 增加对最大 cpu 时间的记录 2015-08-13 20:28:23 +08:00