QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 16:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,266 Commits 8 Branches 14 Tags 24 MiB
66fb74c602
Commit Graph

1266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
virusdefender
722d79a1c8 --isolate-process true 2015-09-17 18:09:14 +08:00
virusdefender
098011c48f Accept Merge Request #247 使用 supervisord 启动 docker 内进程 : (virusdefender-dev -> dev) 
Merge Request: 使用 supervisord 启动 docker 内进程
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/247
 2015-09-17 16:36:41 +08:00
virusdefender
2d1a95aa44 fix typo 2015-09-17 16:11:14 +08:00
virusdefender
07f87acae4 如果 nodaemon=true docker 会认为整个容器已经结束了 2015-09-17 16:07:53 +08:00
virusdefender
b163664e9f fix typo 2015-09-17 15:42:38 +08:00
virusdefender
beb060bf63 修复配置文件日志路径错误 2015-09-17 15:41:44 +08:00
virusdefender
7f72e3f1b0 docker file 中 ADD 不能使用上级目录 2015-09-17 15:27:08 +08:00
virusdefender
0f28c0e2ce 使用 superivisord 启动进程 2015-09-17 15:21:08 +08:00
virusdefender
3d630a4efd Accept Merge Request #246 登录注册验证码，注册页面用户名，邮箱ajax验证 : (dev-sxw -> dev) 
Merge Request: 登录注册验证码，注册页面用户名，邮箱ajax验证
Created By: @esp
Reviewed By: @virusdefender 
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/246
 2015-09-17 13:30:00 +08:00
sxw@401
6a40e88178 Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj 
Conflicts:
	contest/views.py
 2015-09-17 13:25:38 +08:00
virusdefender
34e5ccb993 Accept Merge Request #245 封榜的时候只显示自己的提交 : (virusdefender-dev -> dev) 
Merge Request: 封榜的时候只显示自己的提交
Created By: @virusdefender
Reviewed By: @esp 
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/245
 2015-09-17 11:36:51 +08:00
sxw@401
03e64ad08d Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj 
Conflicts:
	contest/views.py
修复冲突，修改了不恰当的函数名
 2015-09-17 11:33:55 +08:00
sxw@401
3c1d256cc2 dev标签未闭合，修复，整理格式 2015-09-17 11:28:27 +08:00
virusdefender
878d71f60e 修复 celery 启动 docker 的时候 cannot enable tty mode on non tty input 的问题 2015-09-17 11:18:38 +08:00
virusdefender
3d01918489 pre 的背景颜色 2015-09-17 11:18:11 +08:00
sxw@401
2b4ec33945 添加注册页面用户名，邮箱已被注册的ajax表单验证 2015-09-17 10:53:33 +08:00
sxw@401
a3ff63aacf 添加用户登录（只有管理员需要验证），注册的验证码 2015-09-17 10:25:02 +08:00
sxw@401
880a5139b2 添加判断用户登录是否需要验证码的API 2015-09-17 10:24:01 +08:00
virusdefender
4bfdad10de submission 过滤多余字段 2015-09-17 10:15:05 +08:00
virusdefender
c713b6d118 Merge branch 'dev-sxw' into virusdefender-dev 
* dev-sxw:
  实现了比赛提交列表里封榜的行为，封榜以后只显示缓存里的提交数据和封榜后自己的提交，封榜以后rank不再刷新（rank里还不会显示自己封榜以后的提交。。。这好像不对呀）
  增加比赛提交页面封榜行为
  修改函数名称
  为User   problems_status 添加默认值，并精简了相关代码

Conflicts:
	contest/views.py
 2015-09-17 10:12:43 +08:00
virusdefender
fca28d5059 Merge branch 'dev' into virusdefender-dev 
* dev:
 2015-09-17 09:47:12 +08:00
virusdefender
e4533c9b76 更新 redis 环境变量 2015-09-17 09:44:31 +08:00
virusdefender
aa14962a85 增加判题错误日志 2015-09-17 09:35:10 +08:00
virusdefender
12e2c54aad 在环境变量中取数据库地址 2015-09-17 09:29:59 +08:00
virusdefender
f71adf1634 fix typo 2015-09-17 09:14:44 +08:00
hohoTT
903a36f43d 修改每个页面的title 2015-09-16 21:57:17 +08:00
hohoTT
7a53565a04 Merge branch 'dev' into hohoTT-dev 2015-09-16 21:26:55 +08:00
hohoTT
5011861ee5 Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj into dev 2015-09-16 21:24:16 +08:00
virusdefender
385f9d190e 删除没用的 url 2015-09-16 20:32:00 +08:00
virusdefender
25379e1c1d Accept Merge Request #244 细节更新 : (virusdefender-dev -> dev) 
Merge Request: 细节更新
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/244
 2015-09-16 19:58:02 +08:00
virusdefender
ad7b9275f1 静态文件打包增加提示 2015-09-16 17:29:15 +08:00
virusdefender
9e778f0cc5 题目页面增加来源的隐藏显示项 2015-09-16 17:29:00 +08:00
virusdefender
571b42cfb5 mq中有关比赛的操作增加事务 2015-09-16 17:28:36 +08:00
virusdefender
8e60d08f14 IE浏览器下很多 css 样式错误，决定不再支持，强制跳转。 2015-09-16 15:21:24 +08:00
virusdefender
d5e12d6a23 增加静态文件压缩脚本中的提示 2015-09-16 13:53:31 +08:00
virusdefender
6122cc1a32 优化字体 2015-09-16 13:50:08 +08:00
virusdefender
5723572af7 修改字体样式 2015-09-16 13:25:23 +08:00
virusdefender
758132c40d 增加显示真实姓名的隐藏功能 2015-09-16 12:57:48 +08:00