Commit Graph

705 Commits

Author SHA1 Message Date
virusdefender
2ba1fa5669 修改部分命名风格 2015-08-12 14:56:18 +08:00
virusdefender
88be032a38 修改判题设置;增加web 和 mongodb 数据库的操作 2015-08-12 14:01:34 +08:00
virusdefender
8979def927 编译时忽略警告 2015-08-12 10:56:03 +08:00
virusdefender
408776910d 尝试一下判题 2015-08-12 10:24:06 +08:00
virusdefender
b9f4cbacf6 更新 dockerfile,自动创建临时文件夹 2015-08-11 20:23:22 +08:00
virusdefender
31b65bfa49 Accept Merge Request #70 : (virusdefender-dev -> dev)
Merge Request: 修复 radio 绑定的问题
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/70
2015-08-11 20:14:12 +08:00
virusdefender
d93c4559a5 修改编辑小组信息的时候的 radio 不能绑定的问题 2015-08-11 20:12:05 +08:00
virusdefender
3f8a8e98b3 Merge branch 'dev' into virusdefender-dev
* dev:
  [前端]重新修改添加比赛中测试用例的上传方式,修复了bug,还没有写ajax上传比赛信息的部分,因为没有API[CI SKIP]
  [[前端]修改添加比赛页面格局,只保留一个上传控件,以避免分歧,但仍稍有问题
  Revert "Revert "删除不必要的东西""
  Revert "删除不必要的东西"
  删除不必要的东西
2015-08-11 20:11:19 +08:00
virusdefender
9273c5484d Accept Merge Request #69 : (sxw-dev -> dev)
Merge Request: [前端]添加比赛页面基本完善
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/69
2015-08-11 20:10:25 +08:00
virusdefender
a0b34a01a4 修改 html 中的 typo 2015-08-11 19:48:46 +08:00
esp
ed71eccc5e Merge branch 'dev' into sxw-dev 2015-08-11 19:44:00 +08:00
esp
72dbe24fd2 Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj into dev 2015-08-11 19:43:47 +08:00
esp
e089a550cc [前端]重新修改添加比赛中测试用例的上传方式,修复了bug,还没有写ajax上传比赛信息的部分,因为没有API[CI SKIP] 2015-08-11 19:43:23 +08:00
hohoTT
2725837f2a Merge branch 'dev' into hohoTT-dev 2015-08-11 19:24:20 +08:00
hohoTT
3ff4ed66ad Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj into dev 2015-08-11 19:22:53 +08:00
hohoTT
44f65e92e1 Accept Merge Request #68 : (virusdefender-dev -> dev)
Merge Request: 增加了后台小组管理的功能
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/68
2015-08-11 19:18:43 +08:00
virusdefender
6c59a15c1f 增加了后台小组管理的功能 2015-08-11 19:15:25 +08:00
virusdefender
5d3fcb5e29 修复 url 冲突 2015-08-11 19:15:07 +08:00
virusdefender
807adc57ea 增加了初始化测试数据的代码 2015-08-11 19:14:56 +08:00
virusdefender
6284638b49 增加小组管理功能 2015-08-11 19:14:41 +08:00
hohoTT
931b697267 去除发布、编辑题目测试中代码冗余的问题 2015-08-11 18:03:32 +08:00
esp
381f623a9c [[前端]修改添加比赛页面格局,只保留一个上传控件,以避免分歧,但仍稍有问题 2015-08-11 16:22:59 +08:00
esp
4277f77230 Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj into dev 2015-08-11 15:10:23 +08:00
esp
be8821bf49 Merge branch 'sxw-dev' of https://git.coding.net/virusdefender/qduoj into sxw-dev 2015-08-11 15:09:44 +08:00
hohoTT
6f0e553ee2 Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj into dev 2015-08-11 15:09:20 +08:00
hohoTT
89d30c8ba6 Revert "Revert "删除不必要的东西""
This reverts commit 72ca6d997f.
2015-08-11 15:08:13 +08:00
hohoTT
72ca6d997f Revert "删除不必要的东西"
This reverts commit 73dd1be447.
2015-08-11 15:07:15 +08:00
hohoTT
73dd1be447 删除不必要的东西 2015-08-11 14:54:30 +08:00
virusdefender
eda566c1a2 Accept Merge Request #67 : (hohoTT-dev -> dev)
Merge Request: 修复测试中的 bug
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/67
2015-08-11 14:53:12 +08:00
hohoTT
5063d1c7a2 修改之前的测试,以及增加查询、删除小组成员、用户要加入某个小组和搜索小组时的测试 2015-08-11 14:50:33 +08:00
hohoTT
c8388c8a8f 增加group/views中创建和修改小组时小组名存在时的判断,以及加入小组时重复加入和请求加入时的情况 2015-08-11 14:47:19 +08:00
virusdefender
a8a28a6caf Accept Merge Request #66 : (virusdefender-dev -> dev)
Merge Request: 部分 bug 修复;单元测试的问题修复
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/66
2015-08-10 22:58:15 +08:00
virusdefender
71f3aaf822 后台 js 的部分 bug 修复,还没改完 2015-08-10 22:57:11 +08:00
virusdefender
cadb480573 重命名 sample -> samples
添加标签的逻辑变化
修改部分错误的测试用例
2015-08-10 22:55:22 +08:00
virusdefender
9d962a172f 修复单元测试错误 2015-08-10 21:44:19 +08:00
virusdefender
3aee58a71f Merge branch 'dev' into virusdefender-dev
* dev:
  [前端] 完成了添加题目的页面[CI SKIP]
  [前端]新增jqueryUI库js+css,但是css并没有用到,因为用了效果差,添加img资源也没用,所以干脆删去[CI SKIP]
  [前端-添加问题]添加来源字段   [CI SKIP]
2015-08-10 21:38:40 +08:00
virusdefender
f2580ae351 Accept Merge Request #65 : (sxw-dev -> dev)
Merge Request: 添加问题页面
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/65
2015-08-10 21:37:52 +08:00
virusdefender
7e90a82d9e Merge branch 'dev' into virusdefender-dev
* dev:
2015-08-10 21:37:33 +08:00
esp
9f7206d114 [前端] 完成了添加题目的页面[CI SKIP] 2015-08-10 21:05:55 +08:00
esp
b1b996271f [前端]新增jqueryUI库js+css,但是css并没有用到,因为用了效果差,添加img资源也没用,所以干脆删去[CI SKIP] 2015-08-10 20:56:34 +08:00
virusdefender
2752647f58 增加判题的测试用例文件 2015-08-10 20:19:35 +08:00
virusdefender
502b4944f1 增加题目页面和我的提交页面的代码 2015-08-10 20:19:22 +08:00
virusdefender
441b7383bc 重命名 js submit_problem -> problem 2015-08-10 20:18:46 +08:00
hohoTT
402c7ee87f 增加创建、修改小组以及查询小组列表或者是单个小组时的测试 2015-08-10 18:07:08 +08:00
esp
837f721512 Merge branch 'dev' into sxw-dev 2015-08-10 18:07:08 +08:00
esp
5254f428b4 [前端-添加问题]添加来源字段 [CI SKIP] 2015-08-10 18:05:22 +08:00
hohoTT
82da537a50 增添announcementPage部分的测试 2015-08-10 18:04:35 +08:00
virusdefender
71abd696f0 Accept Merge Request #64 : (virusdefender-dev -> dev)
Merge Request: 增加标签管理的 api
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/64
2015-08-10 18:00:24 +08:00
virusdefender
a6268dcb53 创建题目标签相关的 api 2015-08-10 17:59:39 +08:00
virusdefender
6eb54bec6c Merge branch 'dev' into virusdefender-dev
* dev:
  [前端]修正csrf.js    uploader.js  的参数设置 [CI SKIP]
  [前端]修改添加题目和添加用户页面, 添加新字段, 完善上传功能, 显示已上传文件列表
  [前端]修改用户列表get URL ,因为后端改动API [CI SKIP]
  [前端] 在add_problem完成了webuploader的配置,修改uploader.swf的位置,又放回原地了
  [前端]添加了一些字段,难度,标签,是否可见  [CI SKIP]
2015-08-10 17:07:23 +08:00