virusdefender
|
584d12690e
|
Merge branch 'virusdefender-dev' into debug
* virusdefender-dev:
修改逻辑
|
2015-09-22 14:37:53 +08:00 |
|
virusdefender
|
f0a70c3b09
|
修改逻辑
|
2015-09-22 14:37:45 +08:00 |
|
virusdefender
|
85d9168ba0
|
Merge branch 'virusdefender-dev' into debug
* virusdefender-dev:
增加显示所有提交的调试功能
fix typo
增加比赛倒计时的功能
修复 https环境前端获取到的协议是 http 的问题
|
2015-09-22 14:29:32 +08:00 |
|
virusdefender
|
5ac16a3c7f
|
增加显示所有提交的调试功能
|
2015-09-22 14:28:46 +08:00 |
|
virusdefender
|
0e50f7fdc5
|
Merge branch 'dev' into virusdefender-dev
* dev:
增加比赛倒计时的功能
Conflicts:
contest/models.py
|
2015-09-22 13:10:07 +08:00 |
|
virusdefender
|
0718b4c521
|
fix typo
|
2015-09-22 13:09:01 +08:00 |
|
virusdefender
|
bf2416659f
|
Accept Merge Request #259 增加比赛倒计时的功能 : (hohoTT-dev -> dev)
Merge Request: 增加比赛倒计时的功能
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/259
|
2015-09-22 13:08:24 +08:00 |
|
hohoTT
|
371b9625c2
|
增加比赛倒计时的功能
|
2015-09-22 12:56:10 +08:00 |
|
virusdefender
|
30df3eadb8
|
修复 https环境前端获取到的协议是 http 的问题
|
2015-09-21 23:10:26 +08:00 |
|
virusdefender
|
dc9476f585
|
Merge branch 'virusdefender-dev' into debug
* virusdefender-dev:
增加前台题目的重新判题功能
删除统计功能
修复公告列表中用户权限判断错误的情况,抽取代码为 decorator。
用户不需要验证码的时候刷新验证会导致错误,增加判断
去除部分 magic number
比赛如果不是正在进行的状态,就不创建比赛的分数记录和增加比赛题目计数器
修改刷新时间
增加题目页面倒计时的 js
增加比赛倒计时的 api
增加判题帮助
修复判断验证码是否存在的时候,用户不存在导致的报错
|
2015-09-21 13:57:17 +08:00 |
|
virusdefender
|
5f23bff3c5
|
增加前台题目的重新判题功能
|
2015-09-21 13:56:54 +08:00 |
|
virusdefender
|
60d727d7b2
|
删除统计功能
|
2015-09-21 13:41:14 +08:00 |
|
virusdefender
|
2df5cbe56c
|
Merge branch 'dev'
* dev: (195 commits)
修改刷新时间
增加题目页面倒计时的 js
增加比赛倒计时的 api
增加判题帮助
修复判断验证码是否存在的时候,用户不存在导致的报错
记录用户输出 md5
增加反馈链接
add docker start tool
rename mq
不用的语言使用不同的系统调用过滤
update java runtime security policy
增加 clone 地址范围限制,否则 Java 无法运行
fix mq run path error
修复语言判断 bug
add kill proc
修改codeMirror中代码的样式
修复数据库已有用户problems_statu字段为空造成的问题
fix typo
add c/c++ sys call filter
--isolate-process true
...
Conflicts:
judge/judger/settings.py
judge/judger_controller/settings.py
template/src/oj/contest/contest_problem.html
template/src/oj/contest/submissions_list.html
|
2015-09-21 13:06:12 +08:00 |
|
virusdefender
|
cb0e7cf938
|
修复公告列表中用户权限判断错误的情况,抽取代码为 decorator。
|
2015-09-21 12:32:50 +08:00 |
|
virusdefender
|
725d950e27
|
用户不需要验证码的时候刷新验证会导致错误,增加判断
|
2015-09-21 12:28:22 +08:00 |
|
virusdefender
|
041fd2cb60
|
去除部分 magic number
|
2015-09-21 11:16:30 +08:00 |
|
virusdefender
|
43be94cce6
|
比赛如果不是正在进行的状态,就不创建比赛的分数记录和增加比赛题目计数器
|
2015-09-21 11:06:11 +08:00 |
|
virusdefender
|
3b8eef1bab
|
Accept Merge Request #257 增加比赛倒计时 api;修复小 bug : (virusdefender-dev -> dev)
Merge Request: 增加比赛倒计时 api;修复小 bug
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/257
|
2015-09-20 23:34:22 +08:00 |
|
virusdefender
|
3ef7644e9b
|
修改刷新时间
|
2015-09-20 14:41:34 +08:00 |
|
virusdefender
|
899f276800
|
增加题目页面倒计时的 js
|
2015-09-20 14:11:17 +08:00 |
|
virusdefender
|
fcafd34442
|
增加比赛倒计时的 api
|
2015-09-20 14:11:03 +08:00 |
|
virusdefender
|
0d6d1a4102
|
增加判题帮助
|
2015-09-20 14:10:38 +08:00 |
|
virusdefender
|
ca79af958a
|
Merge branch 'dev' into debug
* dev:
|
2015-09-19 19:41:07 +08:00 |
|
virusdefender
|
4e52c56eef
|
Merge branch 'dev' into virusdefender-dev
* dev:
修改codeMirror中代码的样式
修改每个页面的title
修改错误
改下首页跳转的函数名
|
2015-09-19 19:39:40 +08:00 |
|
virusdefender
|
83124f3c86
|
修复判断验证码是否存在的时候,用户不存在导致的报错
|
2015-09-19 18:46:03 +08:00 |
|
virusdefender
|
d9e5030027
|
Merge branch 'virusdefender-dev' into debug
* virusdefender-dev:
记录用户输出 md5
增加反馈链接
|
2015-09-19 15:08:25 +08:00 |
|
virusdefender
|
18abd6a465
|
记录用户输出 md5
|
2015-09-19 15:07:31 +08:00 |
|
virusdefender
|
ca03a5f372
|
Accept Merge Request #250 小 bug 修复 : (virusdefender-dev -> dev)
Merge Request: 小 bug 修复
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/250
|
2015-09-19 08:14:21 +08:00 |
|
sxw@401
|
223cb895ae
|
Merge branch 'debug' of https://git.coding.net/virusdefender/qduoj into debug
Conflicts:
tools/run.py
添加了空行
|
2015-09-18 21:50:32 +08:00 |
|
sxw@401
|
2a8d7ca35c
|
Merge branch 'debug' of https://git.coding.net/virusdefender/qduoj into debug
|
2015-09-18 21:48:54 +08:00 |
|
virusdefender
|
43dc543c06
|
增加反馈链接
|
2015-09-18 19:57:51 +08:00 |
|
virusdefender
|
0c079b7160
|
add docker start tool
|
2015-09-18 16:06:28 +08:00 |
|
virusdefender
|
848eb21669
|
rename mq
|
2015-09-18 16:05:04 +08:00 |
|
virusdefender
|
07f310b4b8
|
不用的语言使用不同的系统调用过滤
|
2015-09-18 13:13:03 +08:00 |
|
virusdefender
|
33ba871af0
|
update java runtime security policy
|
2015-09-18 12:52:00 +08:00 |
|
virusdefender
|
482a537ce0
|
增加 clone 地址范围限制,否则 Java 无法运行
|
2015-09-18 11:18:16 +08:00 |
|
virusdefender
|
054536a72e
|
fix mq run path error
|
2015-09-18 11:17:52 +08:00 |
|
virusdefender
|
afc17e7d87
|
修复语言判断 bug
|
2015-09-18 11:10:47 +08:00 |
|
virusdefender
|
a15059c114
|
add kill proc
|
2015-09-17 23:14:02 +08:00 |
|
virusdefender
|
20d69dc515
|
Accept Merge Request #249 修改codeMirror中代码的样式、页面的title、首页跳转的函数名 : (hohoTT-dev -> dev)
Merge Request: 修改codeMirror中代码的样式、页面的title、首页跳转的函数名
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/249
|
2015-09-17 21:25:46 +08:00 |
|
hohoTT
|
924e6981d4
|
Merge branch 'dev' into hohoTT-dev
|
2015-09-17 21:23:10 +08:00 |
|
hohoTT
|
8cdd0052d8
|
Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj into dev
|
2015-09-17 21:22:40 +08:00 |
|
hohoTT
|
5e8a602480
|
修改codeMirror中代码的样式
|
2015-09-17 21:21:03 +08:00 |
|
virusdefender
|
26c46f1e2a
|
Merge branch 'dev' into virusdefender-dev
* dev:
修复数据库已有用户problems_statu字段为空造成的问题
|
2015-09-17 20:48:56 +08:00 |
|
virusdefender
|
8aa7ce01aa
|
Accept Merge Request #248 修复问题列表的ac标识的bug : (dev-sxw -> dev)
Merge Request: 修复问题列表的ac标识的bug
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/248
|
2015-09-17 20:47:03 +08:00 |
|
sxw@401
|
24f1a51ca3
|
修复数据库已有用户problems_statu字段为空造成的问题
|
2015-09-17 20:43:59 +08:00 |
|
hohoTT
|
17a0448890
|
Merge branch 'dev' into hohoTT-dev
Conflicts:
oj/urls.py
|
2015-09-17 20:33:16 +08:00 |
|
virusdefender
|
9df3ffa782
|
fix typo
|
2015-09-17 20:21:55 +08:00 |
|
hohoTT
|
5fb55221ea
|
Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj into dev
|
2015-09-17 19:58:14 +08:00 |
|
virusdefender
|
83539c13ea
|
add c/c++ sys call filter
|
2015-09-17 19:56:51 +08:00 |
|