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,804 Commits 8 Branches 14 Tags 24 MiB
5091070759
Commit Graph

1804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sxw@401
8785035a36 rank 2015-09-05 19:21:14 +08:00
sxw@401
e871e51f0b Merge branch 'dev-sxw' of git.coding.net:virusdefender/qduoj into dev-sxw 
i
 2015-09-05 18:55:10 +08:00
sxw@401
c163103542 修改比赛排名的bug 2015-09-05 18:54:25 +08:00
sxw@401
152d949a14 修改了rank模板总提交数的属性名称 2015-09-05 18:27:58 +08:00
sxw@401
7cf1df266e 用户上传测试用例文件过大时引发memoryERROR 2015-09-05 16:47:59 +08:00
hohoTT
668e091eaa Merge branch 'for-contest' of https://git.coding.net/virusdefender/qduoj into for-contest-dev 2015-09-05 16:22:49 +08:00
esp
aef3c45dfa update contest_problem.html 2015-09-05 16:09:43 +08:00
esp
59fd241053 update contest_problem.html 2015-09-05 16:03:55 +08:00
hohoTT
2c6bf1d113 Merge branch 'for-contest' of https://git.coding.net/virusdefender/qduoj into for-contest-dev 2015-09-05 11:45:22 +08:00
esp
321d212fda Accept Merge Request #157 更新服务器 : (dev-sxw -> for-contest) 
Merge Request: 更新服务器
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/157
 2015-09-05 11:41:05 +08:00
hohoTT
b00e401c5a Accept Merge Request #156 更新服务器 : (dev-sxw -> for-contest) 
Merge Request: 更新服务器
Created By: @esp
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/156
 2015-09-05 11:34:37 +08:00
esp
53c57dc1c3 Accept Merge Request #155 更新服务器代码 : (dev-sxw -> for-contest) 
Merge Request: 更新服务器代码
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/155
 2015-09-05 11:21:01 +08:00
esp
6dc2d77189 Accept Merge Request #154 修改比赛排名 : (dev-sxw -> for-contest) 
Merge Request: 修改比赛排名
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/154
 2015-09-05 11:02:19 +08:00
hohoTT
56c38f21ac Merge branch 'for-contest' of https://git.coding.net/virusdefender/qduoj into for-contest-dev 2015-09-04 20:01:41 +08:00
lsxwxs
49644a462b 添加运行判体脚本[CI SKIP] 2015-09-03 21:44:02 +08:00
esp
2e69fbfe0d Accept Merge Request #153 更新测试服务器代码 : (dev-sxw -> for-contest) 
Merge Request: 更新测试服务器代码
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/153
 2015-09-03 20:40:37 +08:00
esp
b1c5cf72ec [前台js]添加小组申请的非空验证方法[CI SKIP] 2015-09-03 20:35:54 +08:00
esp
a16198b861 [前台]修改小组逻辑,修正之前加入无需申请的小组的时候错误的提示,无需申请的小组取消申请列表栏 2015-09-03 20:25:09 +08:00
esp
57f60706b7 Accept Merge Request #152 更新测试服务器代码 : (dev-sxw -> for-contest) 
Merge Request: 更新测试服务器代码
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/152
 2015-09-03 11:17:24 +08:00
esp
bfde3b976b 把关于页面的href改为'#',在比赛列表为空是提示小组列表的链接[CI SKIP] 2015-09-03 10:17:10 +08:00
lsxwxs
fc7f4ae3b7 对盘题系统针对新测试服务器进行调整,该分支将不会并入主分支[CI SKIP] 2015-09-03 00:41:36 +08:00
lsxwxs
6267b4d295 Merge branch 'for-contest' of git.coding.net:virusdefender/qduoj into for-contest 
update
 2015-09-03 00:29:15 +08:00
esp
69cc85eb01 correct the path of test case in judger 2015-09-03 00:28:34 +08:00
lsxwxs
5000bbc38f 原来的dockerimage里没有MySQL-python,所以又改了下[CI SKIP] 2015-09-02 23:03:05 +08:00
lsxwxs
eb376c49fc 漏了一个import[CI SKIP] 2015-09-02 22:59:43 +08:00
lsxwxs
668f0d53c2 Merge branch 'for-contest' of git.coding.net:virusdefender/qduoj into for-contest 
update form remote
 2015-09-02 22:27:58 +08:00
esp
655b18421e 这是为了能以root身份运行celery[CI SKIP] 2015-09-02 22:26:58 +08:00
lsxwxs
56fe6b3999 Merge branch 'for-contest' of git.coding.net:virusdefender/qduoj into for-contest 
asdf
 2015-09-02 20:28:50 +08:00
esp
e4a5e4155b 为了在qduoj.cf上运行做了改动，因为判题和web都在一台机器上，这个docker image是从digitalOcean上download下来的[CI SKIP] 2015-09-02 20:26:55 +08:00
hohoTT
9d01c9fbe9 Merge branch 'dev' into hohoTT-dev 2015-09-02 15:48:31 +08:00
hohoTT
1045a8a007 Merge branch 'dev' into hohoTT-dev 
Conflicts:
	template/src/oj/submission/my_submissions_list.html
 2015-09-02 15:46:53 +08:00
lsxwxs
8740b43a1d Merge branch 'dev' of git.coding.net:virusdefender/qduoj into dev 
ok, but i have nothing to say~
 2015-09-02 15:37:52 +08:00
esp
6f62d7e650 Accept Merge Request #150 前台表单验证再次统一，改密码功能改动，后台用户名显示，去重复代码 : (dev-sxw -> dev) 
Merge Request: 前台表单验证再次统一，改密码功能改动，后台用户名显示，去重复代码
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/150
 2015-09-02 15:33:02 +08:00
lsxwxs
1d7078e559 Merge branch 'dev' of git.coding.net:virusdefender/qduoj 
Nothing
 2015-09-02 09:18:48 +08:00
virusdefender
a4433a1cf3 Accept Merge Request #149 修改部分配置项目 : (virusdefender-dev -> dev) 
Merge Request: 修改部分配置项目
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/149
 2015-09-01 22:35:13 +08:00
virusdefender
90f54e0226 Merge branch 'dev' into virusdefender-dev 
* dev:
  由于修改了返回的时间的格式,原来的api是返回utc时间,现在直接返回北京时间了,于是测试还过不了,先注释掉了,明天改好
  重新修改后台比赛编辑前后端时间不一致问题,修改了后端serializers,通过继承原来的serializer.DateTimeField类替换contestSerilazer中的DateTime.这会影响到contestAdminApi的return,并不影响其他页面.而且通过timezone.local()方法转换时区
  添加前台小组申请和申请列表,的一系列页面,带测试,这个结构类似与题目和题目提交列表的样式和结构(页面的关系),写了简略的测试
  [后端]这次commit跟上一次紧密相关,添加了接受和拒绝请求时对models里新加字段的操作
  [后端]修改group.models里joinGroupRequest.添加了accept字段,用于标识此次请求是否被接受,用于前台展示
  修改typo,修改旧的test的url,因为上午修改join_group的api的url
  [前端]修改我的提交页面错误的url[CI SKIP]
  添加group详细页面url 修改原来申请加入小组的apiurl,原来是admin普通用户没法用
  [修复]去掉urls中重复的匹配项
 2015-09-01 22:34:44 +08:00
esp
d48e9de074 [后台]删除重复的代码,应该是我上次复制了别的代码搞重了[CI SKIP] 2015-09-01 21:04:28 +08:00
esp
0e322da9d6 [前台]修改修改密码功能,api添加@login_requrie,去掉界面和api中的username字段,这个从request可以拿到,要用户输入反而不好弄了,也没必要,顺便改了测试[CI不能SKIP] 2015-09-01 19:04:07 +08:00
esp
850815a49f [前台]注册页面,统一完善表单验证,(用户名和邮箱的已被注册验证还没搞,那要改动api了)[CI SKIP] 2015-09-01 18:13:07 +08:00
esp
83d63d7721 [后台-前端]修改后台右上角用户区域,增加退出,我的提交等链接[CI SKIP] 2015-09-01 15:37:19 +08:00
virusdefender
26a7a279c1 修改 daocloud ci 环境变量 2015-08-31 22:43:03 +08:00
virusdefender
fe7d429dba Accept Merge Request #148 添加前台加入小组系列页面;从后端统一比赛时间 : (dev-sxw -> dev) 
Merge Request: 添加前台加入小组系列页面;从后端统一比赛时间
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/148
 2015-08-31 22:24:57 +08:00
esp
4845f24134 由于修改了返回的时间的格式,原来的api是返回utc时间,现在直接返回北京时间了,于是测试还过不了,先注释掉了,明天改好 2015-08-31 22:24:05 +08:00
esp
001a4e6bd4 重新修改后台比赛编辑前后端时间不一致问题,修改了后端serializers,通过继承原来的serializer.DateTimeField类替换contestSerilazer中的DateTime.这会影响到contestAdminApi的return,并不影响其他页面.而且通过timezone.local()方法转换时区 2015-08-31 22:04:58 +08:00
esp
bc435d6515 Merge branch 'dev' into dev-sxw 
Nothing~
 2015-08-31 20:57:36 +08:00
esp
de04f0c2e3 添加前台小组申请和申请列表,的一系列页面,带测试,这个结构类似与题目和题目提交列表的样式和结构(页面的关系),写了简略的测试 2015-08-31 20:54:32 +08:00
esp
37defa0266 [后端]这次commit跟上一次紧密相关,添加了接受和拒绝请求时对models里新加字段的操作 2015-08-31 20:52:18 +08:00
esp
0e76991837 [后端]修改group.models里joinGroupRequest.添加了accept字段,用于标识此次请求是否被接受,用于前台展示 2015-08-31 20:49:36 +08:00
virusdefender
b54b0717f6 update docker file 2015-08-31 20:02:54 +08:00
virusdefender
e1256bf652 fix typo 2015-08-31 19:57:28 +08:00