QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-12-28 16:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,933 Commits 8 Branches 14 Tags 24 MiB
master
Commit Graph

1933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
esp
91add6e1e0 Merge branch 'dev' into sxw-dev 2015-08-10 17:03:00 +08:00
esp
70a77cccc8 [前端]修正csrf.js uploader.js 的参数设置 
[CI SKIP]
 2015-08-10 17:00:39 +08:00
esp
fc1638d468 [前端]修改添加题目和添加用户页面， 添加新字段， 完善上传功能， 显示已上传文件列表 2015-08-10 16:59:45 +08:00
virusdefender
d37bbb3eab 修改判题的目录结构；增加celery 配置 2015-08-10 16:59:43 +08:00
esp
f37b21aafd [前端]修改用户列表get URL ，因为后端改动API 
[CI SKIP]
 2015-08-10 16:58:04 +08:00
esp
fe4fc94657 [前端] 在add_problem完成了webuploader的配置,修改uploader.swf的位置，又放回原地了 2015-08-10 16:44:29 +08:00
hohoTT
e55997065f Accept Merge Request #62 : (hohoTT-dev -> dev) 
Merge Request: 创建题目管理的api和公告的显示页面
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/62
 2015-08-10 15:24:51 +08:00
hohoTT
ecd32618ae 删除 print 2015-08-10 15:23:52 +08:00
hohoTT
b45a79a65b Merge branch 'dev' into hohoTT-dev 2015-08-10 15:22:47 +08:00
hohoTT
b37b0d34c6 Merge branch 'dev' into hohoTT-dev 
Conflicts:
	oj/settings.py
	oj/urls.py
	problem/views.py
 2015-08-10 15:20:17 +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
hohoTT
4b91d7b645 announcement模板修改 2015-08-10 15:02:40 +08:00
hohoTT
76cf78a679 增加announcement页面模板 2015-08-10 15:01:40 +08:00
esp
916ecf3ddf Merge branch 'dev' into sxw-dev 2015-08-10 14:47:56 +08:00
esp
99fbb6dfaa [前端]添加了一些字段，难度，标签，是否可见 [CI SKIP] 2015-08-10 14:47:06 +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