xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
331 Commits 1 Branch 0 Tags
5eda65993b7bad83f54e77008f21865f5d2e1ab6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
virusdefender 3f76df3079 Accept Merge Request #88 : (hohoTT-dev -> dev) 
Merge Request: 修改problem中的测试及views
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/88
 2015-08-16 18:34:39 +08:00
virusdefender de25b6c218 Accept Merge Request #86 : (virusdefender-dev -> dev) 
Merge Request: 替换掉商业版的 formvalidation
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/86
 2015-08-16 12:16:08 +08:00
virusdefender fbd109ccc1 增加判题的异常处理 2015-08-16 12:15:13 +08:00
virusdefender 83ad1e9f3c 替换掉商业版的 formvalidation 2015-08-16 12:14:56 +08:00
virusdefender 3f56e99f3c Accept Merge Request #84 : (virusdefender-dev -> dev) 
Merge Request: 修改配置文件
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/84
 2015-08-16 08:56:05 +08:00
virusdefender a36268bcc8 修改配置项目 2015-08-16 08:47:03 +08:00
virusdefender d5ab12bb32 修改代码格式 2015-08-15 23:46:52 +08:00
virusdefender 884d3ff980 避免硬编码网站信息 2015-08-15 23:46:40 +08:00
virusdefender a6bd787b86 修改 celery 配置文件格式 2015-08-15 23:46:25 +08:00
virusdefender 7e16a9feb8 修复 waiting 状态下颜色错误的问题 2015-08-15 20:40:54 +08:00
virusdefender 7eef07f0ca 增加对判题超时的提示 2015-08-15 20:38:53 +08:00
virusdefender b4d70d8ebd Accept Merge Request #79 : (virusdefender-dev -> dev) 
Merge Request: 去除对 subprocess 的依赖
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/79
 2015-08-15 17:52:26 +08:00
virusdefender 397927ef21 去除启动 docker 的超时 2015-08-15 17:52:07 +08:00
virusdefender b49e571790 Merge branch 'dev' into virusdefender-dev 
* dev:
 2015-08-15 17:50:43 +08:00
virusdefender 272169c0c8 去除对 subprocess32的依赖 2015-08-15 17:49:51 +08:00
virusdefender 5ab004638d 修复配置文件错误 2015-08-15 17:02:46 +08:00
virusdefender 088787443e 修改判题端配置文件 2015-08-15 17:00:55 +08:00
virusdefender cb7dd2f820 修改判题的目录结构 2015-08-15 14:50:22 +08:00
virusdefender 025335b40a 修改 js 的命名风格 2015-08-15 13:54:30 +08:00
virusdefender d031f14a68 增加了题目列表页 2015-08-14 16:38:31 +08:00
virusdefender 489bbb841a fix typo 2015-08-14 16:38:13 +08:00
virusdefender 4c9ffa40b0 Accept Merge Request #76 : (virusdefender-dev -> dev) 
Merge Request: 修复一点小问题
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/76
 2015-08-14 10:37:28 +08:00
virusdefender a0613e0a75 更换 mongodb 设置写法 2015-08-14 10:36:48 +08:00
virusdefender 84b8d1e067 fix typo 2015-08-14 10:36:34 +08:00
virusdefender 174752b9b1 修复测试同名问题 2015-08-14 10:36:23 +08:00
virusdefender fd07ff4666 Accept Merge Request #75 : (virusdefender-dev -> dev) 
Merge Request: 完善提交代码判题和显示提交信息页面
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/75
 2015-08-14 10:24:34 +08:00
virusdefender 59ee24de45 完善提交页面、提交列表和对应的后台逻辑 2015-08-14 10:23:06 +08:00
virusdefender 11a4c04443 统一使用 error_page 的形式返回错误页面 2015-08-14 10:22:32 +08:00
virusdefender e84039eea1 增加逻辑判断用户名重复的问题 2015-08-14 10:21:50 +08:00
virusdefender f3be10161f 修复错误的测试 url 名称修改导致 2015-08-14 10:21:22 +08:00
virusdefender 7f3044086f 更换 templatetags 目录 2015-08-14 10:21:02 +08:00
virusdefender 94282f3ed8 更新我的提交列表页面 2015-08-13 21:02:17 +08:00
virusdefender 58f9014688 修改题目前端样式 2015-08-13 20:29:11 +08:00
virusdefender 2731bc9249 修改 docker 运行时间配置 2015-08-13 20:28:41 +08:00
virusdefender 0aeeab3c8c 增加对最大 cpu 时间的记录 2015-08-13 20:28:23 +08:00
virusdefender ad160b171f Merge branch 'dev' into virusdefender-dev 
* dev:
  修改后端problem中的的命名规范
  前端创建题目界面增加输入描述和输出描述
  后端增加输入描述与输出描述两个字段，并修改其相关的后端内容
 2015-08-13 18:16:18 +08:00
virusdefender 5a967789a6 修改前端提交代码的界面 2015-08-13 18:15:54 +08:00
virusdefender da03f902c5 修改判题端的部分 bug 2015-08-13 18:15:00 +08:00
virusdefender 33e7b70703 Accept Merge Request #74 : (hohoTT-dev -> dev) 
Merge Request: 前端与后端创建题目中增加输入描述和输出描述两个字段的修改
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/74?tab=commits
 2015-08-13 18:14:30 +08:00
virusdefender 5273e9a48d 修复 decorator 导致 swagger 无法识别注释的问题 2015-08-12 23:18:22 +08:00
virusdefender 309401f755 增加小组筛选条件 2015-08-12 22:59:50 +08:00
virusdefender 10ad8f85b5 整理 url 格式 2015-08-12 22:59:36 +08:00
virusdefender 41eec53430 合并用户管理的代码 2015-08-12 22:59:27 +08:00
virusdefender f6c3ceee40 删除 ManyToMany 字段无效的 null=True 2015-08-12 22:59:05 +08:00
virusdefender ba57341dbd Merge branch 'dev' into virusdefender-dev 
* dev:
  修改group测试中部分代码
  前端 增加修改小组信息部分
  修改group/views中的命名错误
  group测试增加 加入小组请求测试并完善
  去除发布、编辑题目测试中代码冗余的问题
 2015-08-12 20:03:17 +08:00
virusdefender 66d3cd3bfe 判题暂时可以跑起来了，真要被自己蠢哭了 2015-08-12 19:55:41 +08:00
virusdefender d625c4dcec Accept Merge Request #71 : (hohoTT-dev -> dev) 
Merge Request: group测试和前端修改小组信息部分
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/71
 2015-08-12 18:15:09 +08:00
virusdefender 92ab7e5fb2 更改项目结构 2015-08-12 16:49:25 +08:00
virusdefender 702d51f495 fix typo 2015-08-12 15:06:19 +08:00
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
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
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
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
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
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
virusdefender 977393ac80 Accept Merge Request #63 : (sxw-dev -> dev) 
Merge Request: [前端]添加add_problem,add_contest页面字段，完成upload功能，小bug修复
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/63
 2015-08-10 17:06:32 +08:00
virusdefender d37bbb3eab 修改判题的目录结构；增加celery 配置 2015-08-10 16:59:43 +08:00
virusdefender be63e0c7c6 Accept Merge Request #61 : (virusdefender-dev -> dev) 
Merge Request: 修复缺少 test_url 的问题
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/61
 2015-08-10 15:19:09 +08:00
virusdefender 1caa134d1b 修复缺少 test url 的问题 2015-08-10 15:18:37 +08:00
virusdefender c65799ce4c Accept Merge Request #60 : (virusdefender-dev -> dev) 
Merge Request: 更新小组管理的代码；增加上传测试用例的代码
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/60
 2015-08-10 14:31:24 +08:00
virusdefender 526b2d0f6e 上传文件后写入配置文件 2015-08-10 14:30:06 +08:00
virusdefender 63bcb09c0f 排除测试用例上传目录 2015-08-10 13:54:19 +08:00
virusdefender 17de985404 fix typo ；创建不存在的文件夹 ；加强有效性判断 2015-08-10 13:53:03 +08:00
virusdefender d58dd821aa 自动判断是 jQuery 的 Ajax 请求还是 webuploader 的文件上传请求，添加不同的 csrf token. 2015-08-10 13:45:56 +08:00
virusdefender c809d0de47 增加上传和解析测试用例压缩包的接口 2015-08-10 12:25:35 +08:00
virusdefender 09b59d6e43 fix typo 2015-08-10 12:24:36 +08:00
virusdefender 80697ddefb Merge branch 'sxw-dev' into virusdefender-dev 
* sxw-dev:
  [前端-添加题目，添加比赛 ]: 1.新增添加题目页面。 2.修改添加比赛页面，统一了avalon的用法，新增富文本编辑框的非空验证 3.收集新增比赛和新增题目页面输入，提交表单后可以在console中看到提交的值
  增加了AdminRequired的测试用例
 2015-08-09 22:07:09 +08:00
virusdefender b6c31ba7a6 增加安装脚本 2015-08-09 22:06:23 +08:00