xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240 Commits 1 Branch 0 Tags
72dbe24fd2e16f6f3426cbf0f15ebb6a0bf7acce
Commit Graph
58 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
esp 72dbe24fd2 Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj into dev 2015-08-11 19:43:47 +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
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
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
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
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
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
esp 4f9ef5f1c2 Merge branch 'dev' into sxw-dev 2015-08-09 20:54:02 +08:00
sxw da62522279 [前端-添加题目，添加比赛 ]: 
1.新增添加题目页面。
2.修改添加比赛页面，统一了avalon的用法，新增富文本编辑框的非空验证
3.收集新增比赛和新增题目页面输入，提交表单后可以在console中看到提交的值

[CI SKIP]
 2015-08-09 20:50:04 +08:00
sxw 94fecc14f3 [前端] 修改announcement模块轻微问题 
1. 去掉翻页函数多余的参数
2.去掉新增公告刷新函数调用时多传的参数
3.去掉模板空的style标签
[CI SKIP]
 2015-08-08 17:11:36 +08:00
sxw 4578426f99 [功能] 新增公告管理模块，对GET users API轻微修改，筛管理员添加超级管理员包含 2015-08-08 17:09:15 +08:00
esp c3fcb119c4 Accept Merge Request #49 : (hohoTT-dev -> dev) 
Merge Request: 修改了用户编辑密码时，密码是否编辑的两个测试用例
Created By: @hohoTT
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/49
 2015-08-08 16:45:12 +08:00
esp 9f11ec3943 Accept Merge Request #48 : (sxw-dev -> dev) 
Merge Request: 修复typo
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/48
 2015-08-08 12:54:51 +08:00
sxw ad818d1cbd admin/views里里面的typo 2015-08-08 12:53:58 +08:00
esp f4b84652fe Accept Merge Request #46 : (sxw-dev -> dev) 
Merge Request: 修复代码中的冲突
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/46
 2015-08-08 12:29:33 +08:00
sxw 31b9367a87 修复合并后的冲突 2015-08-08 12:28:29 +08:00
esp 139a1b74f5 Accept Merge Request #45 : (sxw-dev -> dev) 
Merge Request: 更新后台announcement的功能
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/45
 2015-08-08 12:27:03 +08:00
sxw 31bb8590ad 创建account的数据库migration 2015-08-08 12:23:01 +08:00
sxw 9da0716848 修复announcement js中作用域的问题 2015-08-08 12:22:47 +08:00
sxw fcd5caae02 Merge branch 'dev' into sxw-dev 
Conflicts:
	template/admin/announcement/announcement.html
 2015-08-08 11:31:20 +08:00
sxw 3b2ea92616 Merge branch 'dev' into sxw-dev 2015-08-08 08:47:33 +08:00
sxw 47e63d5c73 并没有改动。。。。 [CI SKIP] 2015-08-08 08:46:54 +08:00
sxw fc57dcbde4 [后端]修改后端公告GET接口，增加返回公告总条数，总页数 2015-08-08 08:41:20 +08:00
sxw a03b8af79d [前端-公告管理]增加仅显示可见公告功能，统一数据获取方法 2015-08-08 08:39:37 +08:00
sxw 43238072ae Merge branch 'dev' into sxw-dev 2015-08-07 20:03:30 +08:00
sxw 324e72c231 后台页面小bug修复 
包括按钮的距离，模板的css等
 2015-08-07 19:46:46 +08:00
esp d5fe1a98dc Accept Merge Request #42 : (sxw-dev -> dev) 
Merge Request: 增加后台公告管理的界面和相关的js
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/42
 2015-08-07 19:30:54 +08:00
sxw 76e3188360 Merge branch 'dev' into sxw-dev 
Conflicts:
	template/admin/admin.html
 2015-08-07 19:28:24 +08:00
sxw 7375bda40c [前端]: 添加了admin公告管理页面以及相应的js，包含公告显示，修改，新建 2015-08-07 19:20:19 +08:00
sxw 2a29dfffb4 添加公告管理的js 2015-08-07 09:24:52 +08:00
sxw b6d27f4383 Merge branch 'dev' into sxw-dev 2015-08-06 16:52:15 +08:00
sxw 79360a1a56 Merge branch 'dev' into sxw-dev 2015-08-06 16:47:59 +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
sxw 65dfd1149b 修复了关于电子邮箱地址是否存在前后端数据标准差异 
修改前端逻辑，先判断code
 2015-08-06 15:12:28 +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
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
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
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
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
sxw 2454db54b0 修复了空格和tab混合的问题 2015-08-03 16:37:20 +08:00
sxw 90eaadbb1c 增加了用户注册页面和对应的urls配置 2015-08-03 16:34:55 +08:00