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

1107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sxw
79360a1a56 Merge branch 'dev' into sxw-dev 2015-08-06 16:47:59 +08:00
virusdefender
58cf3d256f Accept Merge Request #38 : (virusdefender-dev -> dev) 
Merge Request: fix-bug 修复 account migrate 冲突
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/38
 2015-08-06 16:46:28 +08:00
virusdefender
e0dec79066 fix-bug 修复 account migrate 冲突 2015-08-06 16:45:51 +08:00
sxw
7d7b025a8b Merge branch 'dev' into sxw-dev 2015-08-06 16:34:41 +08:00
sxw
8e8909973e 取消username，email字段失去焦点再发送验证请求 2015-08-06 16:33:37 +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
sxw
65dfd1149b 修复了关于电子邮箱地址是否存在前后端数据标准差异 
修改前端逻辑，先判断code
 2015-08-06 15:12:28 +08:00
hohoTT
96c8d28c64 announcement model.py 里面增加一个新的字段（最后更新时间） 2015-08-06 13:17:15 +08:00
virusdefender
20f523c0f5 Accept Merge Request #36 : (virusdefender-dev -> dev) 
Merge Request: bug-fix: 增加 account/models 的 migration
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/36
 2015-08-06 13:06:06 +08:00
virusdefender
53afd2a032 bug-fix: 增加 account/models 的 migration 2015-08-06 13:05:00 +08:00
hohoTT
a07441ce24 Merge branch 'dev' into hohoTT-dev 2015-08-06 12:39:06 +08:00
virusdefender
f1d18a0d46 Accept Merge Request #29 : (virusdefender-dev -> dev) 
Merge Request: 登录页面优化
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/29
 2015-08-06 12:27:01 +08:00
virusdefender
62f07e713f 增加 @admin_required 修饰符代码和对应的测试 2015-08-06 12:25:16 +08:00
hohoTT
2bf0389e7b announcement model.py 里面的 description 改名为 content,并修改其对应的serializers和views 2015-08-06 11:08:02 +08:00
virusdefender
875e3b1671 将注册页面用户名和密码的验证改为了输入框失去焦点的时候才验证，防止发送大量请求。 
增加注册的时候向后端发送邮箱字段。
整理 js 代码风格。
 2015-08-06 09:43:14 +08:00
virusdefender
94d33aede6 Accept Merge Request #26 : (hohoTT-dev -> dev) 
Merge Request: 增加了三个新的功能，去除account/tests.py中不必要的代码
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/26
 2015-08-05 20:26:38 +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
virusdefender
b1c8607820 Accept Merge Request #24 : (sxw-dev -> dev) 
Merge Request: 修改了ajax验证表单的js，添加注册页面email字段
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/24
 2015-08-05 20:09:26 +08:00
sxw
cbb86d72f1 更正了validator命名的问题，remoteCSRF->remote.把原生的remote改成了remotex。。。 
[ci skip]
 2015-08-05 20:01:15 +08:00
sxw
b91ff0688a Merge branch 'dev' into sxw-dev 2015-08-05 19:51:02 +08:00
virusdefender
4793d660ea Accept Merge Request #22 : (virusdefender-dev -> dev) 
Merge Request: 增加 admin 后台返回执行模板的 views 函数；admin spa模板；通用分页参数
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/22
 2015-08-05 19:48:59 +08:00
virusdefender
5eacb9f3d7 增加 admin 后台返回执行模板的 views 函数 2015-08-05 19:47:49 +08:00
virusdefender
21e977f409 Accept Merge Request #21 : (virusdefender-dev -> dev) 
Merge Request: 增加通用分页函数和对应的测试
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/21
 2015-08-05 19:46:06 +08:00
virusdefender
c5446361db 增加了 admin spa 的通用代码[CI SKIP] 2015-08-05 19:45:35 +08:00
sxw
c868441d61 1.在用户注册页面添加了email字段，并附带验证; 
2.统一了username和email字段的唯一性验证方法。
[ci skip]
 2015-08-05 19:40:02 +08:00
sxw
34ccdd5e0e 1.仿照代码重写了原usernameCheck的validator。重命名为remoteCSRF，用于使用ajax异步向服务器验证字段唯一性。参数为url：请求地址，field：向服务器发送的表示符名称； 
2.添加了emailAddress的validator的requires.js的config.
[ci skip]
 2015-08-05 19:38:28 +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
virusdefender
5558600792 补充通用分页函数的注释和用法；修改错误的测试用例 2015-08-05 08:53:39 +08:00
virusdefender
8a6093d645 增加通用分页函数和对应的测试 2015-08-05 08:44:28 +08:00
virusdefender
44be61dab6 修改 runtest.sh，只有在测试成功的情况下才进行测试覆盖率分析和打开结果页面 2015-08-05 08:43:15 +08:00
esp
f04eaae129 Accept Merge Request #13 : (sxw-dev -> dev) 
Merge Request: 添加了Tools中windows脚本；修改重复密码表单校验js
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/13
 2015-08-04 20:01:51 +08:00
sxw
0b55f6bbf7 修改了重复密码验证的js，精简代码量，减少了重复的校验，减少了valuedator中confirm的参数 [ci skip] 2015-08-04 19:54:44 +08:00
hohoTT
4548ffd617 更正公告API测试的名称 2015-08-04 19:23:10 +08:00
sxw
1d4af5cc7c 添加了windows下的runserver和runtest脚本 [ci sikp] 2015-08-04 19:18:56 +08:00
esp
19f9f1c374 Accept Merge Request #12 : (virusdefender-dev -> dev) 
Merge Request: add coverage requirement and run test shell script
Created By: @virusdefender
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/12
 2015-08-04 18:40:41 +08:00
virusdefender
76aba7f0e7 add coverage requirement and run test shell script 2015-08-04 18:38:00 +08:00
virusdefender
f239f41c17 Accept Merge Request #11 : (hohoTT-dev -> dev) 
Merge Request: 增加了公告的API接口和相应的API测试
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/11
 2015-08-04 17:40:33 +08:00
hohoTT
006ed117f1 增加了公告的API接口和相应的API测试 2015-08-04 17:38:04 +08:00
esp
ca7bc6332d Accept Merge Request #10 : (sxw-dev -> dev) 
Merge Request: 添加了登陆，修改密码，注册三个页面的csrf； 添加了usernameCheck的valuedation检测方法; urls.py 添加了register，change_password页面。
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/10
 2015-08-04 16:08:22 +08:00
sxw
62a9e050f5 添加了登陆，修改密码，注册三个页面的csrf； 
添加了usernameCheck的valuedation检测方法;
urls.py 添加了register，change_password页面。
 2015-08-04 16:05:40 +08:00
esp
e75cd60741 Accept Merge Request #9 : (sxw-dev -> dev) 
Merge Request: 增加了修改密码的页面和js
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/9
 2015-08-04 15:02:10 +08:00
sxw
68c5a580d7 Merge branch 'dev' into sxw-dev 
Conflicts:
	oj/urls.py
 2015-08-04 14:58:45 +08:00
sxw
58a664af1b 增加了注册js 2015-08-04 14:56:17 +08:00
sxw
3ccb7740f2 增加了修改密码的页面和js 2015-08-04 14:55:38 +08:00
virusdefender
93e4599789 Accept Merge Request #8 : (virusdefender-dev -> dev) 
Merge Request: 增加 login_required decorator 和对应的测试
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/8
 2015-08-04 13:23:46 +08:00
virusdefender
c72624e2d5 增加 login_required decorator 和对应的测试 2015-08-04 13:22:37 +08:00