virusdefender
|
e2741e0d07
|
Merge branch 'dev' into virusdefender-dev
* dev:
|
2015-08-21 14:00:22 +08:00 |
|
virusdefender
|
40087541f1
|
修复 无法清除图表数据的 bug
|
2015-08-21 13:59:46 +08:00 |
|
virusdefender
|
e572190a66
|
Accept Merge Request #107 新的首页和后台导航栏,还有服务器队列长度监控页面 : (virusdefender-dev -> dev)
Merge Request: 新的首页和后台导航栏,还有服务器队列长度监控页面
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/107
|
2015-08-21 13:59:07 +08:00 |
|
virusdefender
|
4b49fa5050
|
修改计数方式
|
2015-08-21 13:32:02 +08:00 |
|
virusdefender
|
e4ff9e642a
|
将队列长度计数器改为 redis 计数器
|
2015-08-21 13:25:30 +08:00 |
|
esp
|
75eb1192fb
|
[后端-前台]添加了submissions分页显示(只显示当前用户的提交),调用已有的view完成单个submission的显示.显示界面与问题分页显示统一.问题是id的显示.url:http://127.0.0.1:8000/my_submissions/
|
2015-08-20 21:23:53 +08:00 |
|
virusdefender
|
771101ab13
|
主页增加题目的链接
|
2015-08-20 20:51:53 +08:00 |
|
virusdefender
|
a9db5ee5ab
|
修改队列监控的 js,在离开页面的时候自动停止获取数据
|
2015-08-20 20:51:38 +08:00 |
|
virusdefender
|
d0211c3d1b
|
admin 右侧导航栏修改为 js 生成,根据用户身份权限变化
|
2015-08-20 20:51:06 +08:00 |
|
hohoTT
|
0fcbbc962e
|
增加及修改account与announcement的测试
|
2015-08-20 20:24:51 +08:00 |
|
virusdefender
|
4146719673
|
完成监控判题队列长度的前端页面和 js
|
2015-08-20 13:48:43 +08:00 |
|
virusdefender
|
55e4bcb296
|
修复问题列表错误的显示
|
2015-08-20 13:48:19 +08:00 |
|
virusdefender
|
d8dd9cd72c
|
完成服务器判题队列长度监控功能
|
2015-08-20 13:47:57 +08:00 |
|
esp
|
919b648695
|
[前端]修改添加比赛页面,新增了使用小组api查询该用户所创建的所有的小组的功能[CI SKIP]
|
2015-08-20 12:38:52 +08:00 |
|
virusdefender
|
9879195555
|
更新首页文字描述
|
2015-08-19 20:32:11 +08:00 |
|
virusdefender
|
624f71d5af
|
新首页的 js
|
2015-08-19 20:16:46 +08:00 |
|
virusdefender
|
016dc1b79f
|
增加新的首页
|
2015-08-19 20:16:30 +08:00 |
|
hohoTT
|
10e4d534b2
|
修改比赛的views及部分问题
|
2015-08-19 17:53:43 +08:00 |
|
virusdefender
|
096873c028
|
增加队列长度统计信息
|
2015-08-19 16:39:04 +08:00 |
|
esp
|
78050548aa
|
[前端]添加比赛页面进一步完善,添加字段包括是否显示提交,比赛模式,问题分值,允许参加比赛的用户组,并完善内部逻辑,基本可用了,只是没写ajax提交数据,和拉取小组信息的部分[CI SKIP]
|
2015-08-19 10:50:09 +08:00 |
|
virusdefender
|
f158d66c57
|
Merge branch 'dev' into virusdefender-dev
* dev:
|
2015-08-19 08:22:18 +08:00 |
|
virusdefender
|
c98abddfee
|
fix typo
|
2015-08-19 08:21:25 +08:00 |
|
esp
|
766fc20dbe
|
[前端]修改了添加比赛页的形式结构,仍有bug[CI SKIP]
|
2015-08-18 20:37:36 +08:00 |
|
hohoTT
|
bdf3fa9ed9
|
后端修改比赛创建部分,同时在models中增加了几个字段
|
2015-08-18 20:12:27 +08:00 |
|
virusdefender
|
46321e4249
|
修改错误页面、404页面、500页面的样式
|
2015-08-18 16:52:44 +08:00 |
|
hohoTT
|
15febd5cc7
|
Merge branch 'dev' into hohoTT-dev
|
2015-08-18 16:33:08 +08:00 |
|
virusdefender
|
b936123bc7
|
Accept Merge Request #99 增加了小组内可见的公告类型 : (virusdefender-dev -> dev)
Merge Request: 增加了小组内可见的公告类型
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/99
|
2015-08-18 16:04:51 +08:00 |
|
virusdefender
|
97ffd604cf
|
增加了组内可见的公告,编辑了对应的 models 和 js
|
2015-08-18 16:03:49 +08:00 |
|
virusdefender
|
016a49a53b
|
增加登陆后跳转回来源页
|
2015-08-18 16:03:25 +08:00 |
|
hohoTT
|
937c382b25
|
后端比赛和比赛题目的部分,还有要增加和修改的地方
|
2015-08-18 14:59:00 +08:00 |
|
virusdefender
|
c5c23153bf
|
Merge branch 'dev' into virusdefender-dev
* dev:
修改admin中js与html中的问题
用户列表替换掉商业版的 formvalidation
替换掉商业版的 formvalidation
|
2015-08-18 14:29:18 +08:00 |
|
esp
|
c7d7bc7ef1
|
[前端]添加比后台比赛列表[CI SKIP]
|
2015-08-18 13:28:02 +08:00 |
|
esp
|
0eb5b0f62a
|
[前端]统一问题,比赛列表js的文件名_list.js. 添加了比赛列表和编辑比赛的页面(大体样式)[CI SKIP]
|
2015-08-18 13:21:33 +08:00 |
|
virusdefender
|
616aed6a5c
|
增加题目提交总数和通过率统计字段
|
2015-08-17 20:56:42 +08:00 |
|
hohoTT
|
a5211f50da
|
修复一个点击错误
|
2015-08-17 20:54:10 +08:00 |
|
virusdefender
|
c33efce63c
|
Accept Merge Request #93 : (hohoTT-dev -> dev)
Merge Request: 替换掉商业版的 formvalidation,修改admin中js与html中的问题
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/93?tab=files
|
2015-08-17 16:40:27 +08:00 |
|
virusdefender
|
f38c6ecd21
|
Accept Merge Request #92 : (virusdefender-dev -> dev)
Merge Request: 修复后台 bug;优化前台界面显示
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/92
|
2015-08-17 16:35:31 +08:00 |
|
virusdefender
|
5eda65993b
|
Merge branch 'dev' into virusdefender-dev
* dev:
|
2015-08-17 16:34:37 +08:00 |
|
virusdefender
|
ba958eddc2
|
优化前台提交页面的显示
|
2015-08-17 16:33:26 +08:00 |
|
virusdefender
|
ce5b0804b9
|
后台页面跳转时保存上一页状态,同时增加返回按钮
|
2015-08-17 16:33:05 +08:00 |
|
virusdefender
|
3385ddce18
|
修复创建编辑问题的时候提示不能为空的问题
|
2015-08-17 16:32:12 +08:00 |
|
virusdefender
|
b4f45a619f
|
增加数据库路由
|
2015-08-17 16:31:42 +08:00 |
|
hohoTT
|
1790945a3e
|
修改admin中js与html中的问题
|
2015-08-17 16:31:22 +08:00 |
|
hohoTT
|
164e44b398
|
用户列表替换掉商业版的 formvalidation
|
2015-08-17 14:51:33 +08:00 |
|
hohoTT
|
d828be2a28
|
Merge branch 'dev' into hohoTT-dev
|
2015-08-17 14:49:35 +08:00 |
|
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 |
|