xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
607 Commits 1 Branch 0 Tags
588a5e1a7109f41d6bd7907ff9d6910a973e584e
Commit Graph
89 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hohoTT 588a5e1a71 比赛描述居中，注意：后台写题目描述的时候无需空格，描述会自动居中，不然描述会偏离原来居中的方向。 
【后台文本编辑器好像存在BUG】：编辑好描述后，再次编辑的时候，如果之前编辑中每行文字最前面有空格则无法删除。
 2015-09-08 21:24:57 +08:00
hohoTT ad881fd291 Accept Merge Request #185 为了比赛的一些修改，更新到dev中 : (hohoTT-dev -> dev) 
Merge Request: 为了比赛的一些修改，更新到dev中
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/185
 2015-09-07 21:34:43 +08:00
hohoTT 69b80ef448 将dev-hohoTT中的修改更改到hohoTT-dev，用于合并dev 2015-09-07 21:07:05 +08:00
hohoTT aab770b8bf Merge branch 'dev' into hohoTT-dev 
Conflicts:
	contest/views.py
 2015-09-07 20:01:59 +08:00
hohoTT 1c40b71755 Accept Merge Request #161 终于可以合并了..... : (dev-sxw -> dev) 
Merge Request: 终于可以合并了.....
Created By: @esp
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/161
 2015-09-05 16:56:41 +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
hohoTT 93974f03b7 Merge branch 'dev' into hohoTT-dev 
Conflicts:
	template/src/oj/submission/my_submissions_list.html
 2015-08-31 14:36:28 +08:00
hohoTT 2252107a80 完善部分测试 2015-08-29 15:20:49 +08:00
hohoTT a216f8e1ea Merge branch 'dev' into hohoTT-dev 
Conflicts:
	submission/tests.py
	template/src/oj/submission/my_submissions_list.html
 2015-08-29 15:18:09 +08:00
hohoTT 2fbdf265c8 Merge branch 'dev' into hohoTT-dev 
Conflicts:
	contest_submission/tests.py
 2015-08-28 15:26:10 +08:00
hohoTT 7383b0f138 Merge branch 'dev' into hohoTT-dev 2015-08-26 17:01:50 +08:00
hohoTT 3e7dfa9dc8 目前测试还有要完善的地方, contest、还有类似页面不存在的情况等 2015-08-26 16:59:00 +08:00
hohoTT 48eb2d1e9b 前台比赛、比赛题目与普通题目的一系列界面 2015-08-24 21:03:30 +08:00
hohoTT 4d701e0239 添加前台比赛题目列表与单个题目的页面 2015-08-23 18:25:28 +08:00
hohoTT 48d48a0f30 增加了比赛列表页 2015-08-22 20:42:21 +08:00
hohoTT 0bf84d1c40 创建前台比赛列表 2015-08-22 16:08:39 +08:00
hohoTT 8b4580d8f6 后端比赛与比赛题目部分已修改完成 2015-08-22 14:00:09 +08:00
hohoTT 9c43fe92ff Merge branch 'dev' into hohoTT-dev 2015-08-21 18:19:01 +08:00
hohoTT 53d2b674c9 修改并完善比赛及其他部分的内容及测试 2015-08-21 18:16:34 +08:00
hohoTT 33fec6531a CodeMirror自动更改高度的问题 2015-08-21 15:52:18 +08:00
hohoTT 0fcbbc962e 增加及修改account与announcement的测试 2015-08-20 20:24:51 +08:00
hohoTT 10e4d534b2 修改比赛的views及部分问题 2015-08-19 17:53:43 +08:00
hohoTT bdf3fa9ed9 后端修改比赛创建部分，同时在models中增加了几个字段 2015-08-18 20:12:27 +08:00
hohoTT 15febd5cc7 Merge branch 'dev' into hohoTT-dev 2015-08-18 16:33:08 +08:00
hohoTT 937c382b25 后端比赛和比赛题目的部分，还有要增加和修改的地方 2015-08-18 14:59:00 +08:00
hohoTT a5211f50da 修复一个点击错误 2015-08-17 20:54:10 +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
hohoTT d88dde18bb 替换掉商业版的 formvalidation 2015-08-16 20:53:18 +08:00
hohoTT 30348f0c5d 删除problem中多余的代码 2015-08-16 16:52:26 +08:00
hohoTT 277ee83b0f 修改problem中的测试及views 2015-08-16 14:28:09 +08:00
hohoTT dc67491e6e Merge branch 'dev' into hohoTT-dev 2015-08-16 14:20:31 +08:00
hohoTT aa99e9f634 修改并删除测试中不必要的东西 2015-08-15 20:56:39 +08:00
hohoTT 2437608915 Accept Merge Request #80 : (hohoTT-dev -> dev) 
Merge Request: js与css部分的修改
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/80
 2015-08-15 19:51:11 +08:00
hohoTT e3756328af js与css部分的修改 2015-08-15 19:49:58 +08:00
hohoTT 4518257f9d Accept Merge Request #78 : (virusdefender-dev -> dev) 
Merge Request: 修改判题模块
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/78
 2015-08-15 17:17:12 +08:00
hohoTT 692a039801 修改后端problem中的的命名规范 2015-08-13 18:08:51 +08:00
hohoTT a36dd1d267 前端创建题目界面增加输入描述和输出描述 2015-08-13 18:03:38 +08:00
hohoTT d8d91b7ecd 后端增加输入描述与输出描述两个字段，并修改其相关的后端内容 2015-08-13 15:15:53 +08:00
hohoTT 890bbc22a2 修改group测试中部分代码 2015-08-12 18:13:04 +08:00
hohoTT 6153aa4002 前端 增加修改小组信息部分 2015-08-12 18:11:00 +08:00
hohoTT 90bf7fb782 Merge branch 'dev' into hohoTT-dev 2015-08-12 17:46:58 +08:00
hohoTT 49d9a8cd0a 修改group/views中的命名错误 2015-08-12 15:17:27 +08:00
hohoTT b8d3c1ce2d group测试增加 加入小组请求测试并完善 2015-08-12 15:16:19 +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
hohoTT 931b697267 去除发布、编辑题目测试中代码冗余的问题 2015-08-11 18:03:32 +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
hohoTT 5063d1c7a2 修改之前的测试，以及增加查询、删除小组成员、用户要加入某个小组和搜索小组时的测试 2015-08-11 14:50:33 +08:00
hohoTT c8388c8a8f 增加group/views中创建和修改小组时小组名存在时的判断，以及加入小组时重复加入和请求加入时的情况 2015-08-11 14:47:19 +08:00
hohoTT 402c7ee87f 增加创建、修改小组以及查询小组列表或者是单个小组时的测试 2015-08-10 18:07:08 +08:00
hohoTT 82da537a50 增添announcementPage部分的测试 2015-08-10 18:04:35 +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
hohoTT 4b91d7b645 announcement模板修改 2015-08-10 15:02:40 +08:00
hohoTT 76cf78a679 增加announcement页面模板 2015-08-10 15:01:40 +08:00
hohoTT c9c9f1d150 修改problem测试中data变量以及问题创建中各个字段之间的换行问题 2015-08-09 20:58:08 +08:00
hohoTT fb038cfc8e [后台题目管理的api部分] 增添创建题目、编辑题目API及测试用例 2015-08-09 20:03:22 +08:00
hohoTT b089455bba 修改account和announcement中的测试用例，改为当前为管理员用户的登录状态 2015-08-09 19:19:59 +08:00
hohoTT 77a83f7085 Accept Merge Request #58 : (sxw-dev -> dev) 
Merge Request: 增加小组功能
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/58
 2015-08-09 13:01:44 +08:00
hohoTT 3a1f26cb83 Accept Merge Request #50 : (sxw-dev -> dev) 
Merge Request: 新增用户管理-用户列表前端，小bug修复
Created By: @esp
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/50
 2015-08-08 17:16:06 +08:00
hohoTT 1b8d7d3ad5 修改了用户编辑密码时，密码是否编辑的两个测试用例 2015-08-08 14:59:42 +08:00
hohoTT 31479283ce Accept Merge Request #43 : (hohoTT-dev -> dev) 
Merge Request: 增加了用户管理和编辑的API及相应的测试
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/43
 2015-08-07 20:32:06 +08:00
hohoTT 8e5920321e Merge branch 'dev' into hohoTT-dev 2015-08-07 20:27:53 +08:00
hohoTT 69385e96d2 增加了用户管理和编辑的API及相应的测试 2015-08-07 20:25:58 +08:00
hohoTT d64b99eed3 增加了用visible搜索公告的功能，并增加了相应的测试 2015-08-07 20:25:06 +08:00
hohoTT 1675eed67d 添加Announcement的API测试，即url中的announcement_list_api，增加公告编辑及相应的API测试 2015-08-06 19:07:46 +08:00
hohoTT bc874883c7 Accept Merge Request #37 : (hohoTT-dev -> dev) 
Merge Request: 增加了公告发布成功的测试，以及公告分页的APIview
Created By: @hohoTT
Accepted By: @hohoTT
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/37
 2015-08-06 16:30:17 +08:00
hohoTT 844e970276 增加了公告发布成功的测试，以及公告分页的APIview 2015-08-06 16:28:59 +08:00
hohoTT 96c8d28c64 announcement model.py 里面增加一个新的字段（最后更新时间） 2015-08-06 13:17:15 +08:00
hohoTT a07441ce24 Merge branch 'dev' into hohoTT-dev 2015-08-06 12:39:06 +08:00
hohoTT 2bf0389e7b announcement model.py 里面的 description 改名为 content,并修改其对应的serializers和views 2015-08-06 11:08:02 +08:00
hohoTT 98f8b65011 在account/tests.py中删除不必要的代码 2015-08-05 20:23:42 +08:00
hohoTT c0d8d900cd Merge branch 'dev' into hohoTT-dev 2015-08-05 20:12:59 +08:00
hohoTT 117a6d3525 增加用户密码修改成功的API测试，以及增加用户邮箱字段并做了相应的API测试，目前的account/view.py测试覆盖率为100% 2015-08-05 20:11:25 +08:00
hohoTT 17b44800ca 将announcement 加入 setings.py 里面的 INSTALLED_APPS，并且创建announcement这张表 2015-08-05 10:34:00 +08:00
hohoTT 2fae6493d0 Merge branch 'virusdefender-dev' of https://git.coding.net/virusdefender/qduoj into hohoTT-dev 2015-08-05 10:20:18 +08:00
hohoTT 4548ffd617 更正公告API测试的名称 2015-08-04 19:23:10 +08:00
hohoTT 006ed117f1 增加了公告的API接口和相应的API测试 2015-08-04 17:38:04 +08:00
hohoTT b7280719ac 新增修改用户密码和对应的API测试功能 2015-08-03 19:54:55 +08:00
hohoTT 2a2ef36d14 增加用户注册代码和API测试 2015-08-03 18:45:26 +08:00