xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
216 Commits 1 Branch 0 Tags
3aee58a71f14ef046224df85b05356874e574dfa
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
virusdefender a90fdd3f1d 修改语法错误 2015-08-09 22:05:22 +08:00
virusdefender f938950de2 修复用户列表url缺少admin的问题 2015-08-09 21:00:16 +08:00
virusdefender a11e935119 增加小组有关api的注释 2015-08-09 20:05:10 +08:00
virusdefender c772a4bcdc 增加小组成员管理的api；优化权限判断逻辑和精简代码 2015-08-09 19:59:25 +08:00
virusdefender a586aec451 Merge branch 'dev' into virusdefender-dev 2015-08-09 19:22:55 +08:00
virusdefender 7538260891 Accept Merge Request #59 : (hohoTT-dev -> dev) 
Merge Request: 修改account和announcement中的测试用例，改为当前为管理员用户的登录状态
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/59
 2015-08-09 19:22:05 +08:00
virusdefender 06528d379a 增加搜索小组的功能 2015-08-09 19:13:48 +08:00
virusdefender a9b9ae7f76 增加了加入小组的功能 2015-08-09 19:06:55 +08:00
virusdefender 2ce38a6fc0 增加了AdminRequired的测试用例 2015-08-09 18:00:52 +08:00
virusdefender 6f5c9b1657 增加相关的常量的定义以及url参数 2015-08-09 12:58:31 +08:00
virusdefender c4b02270cb 创建group app 
增加相关的models和views
没有测试
 2015-08-09 12:57:59 +08:00
virusdefender f7b6a354b3 增加/admin/和/api/admin/的权限控制middleware 2015-08-09 12:57:13 +08:00
virusdefender d7030adc2c 去除 announcement.js 中的全局变量 2015-08-08 23:11:50 +08:00
virusdefender fd0514b428 更新 problem 和 contest 的 models 2015-08-08 23:04:08 +08:00
virusdefender 5d30b9f46d 后台监控页面样式修改 2015-08-08 23:03:10 +08:00
virusdefender 0afd929c30 Merge branch 'dev' into virusdefender-dev 
* dev:
  [前端] 修改announcement模块轻微问题 1. 去掉翻页函数多余的参数 2.去掉新增公告刷新函数调用时多传的参数 3.去掉模板空的style标签 [CI SKIP]
  [功能] 新增公告管理模块，对GET users API轻微修改，筛管理员添加超级管理员包含
  修改了用户编辑密码时，密码是否编辑的两个测试用例
  admin/views里里面的typo
  修复合并后的冲突
  创建account的数据库migration
  修复announcement js中作用域的问题
  并没有改动。。。。     [CI SKIP]
  [后端]修改后端公告GET接口，增加返回公告总条数，总页数
  [前端-公告管理]增加仅显示可见公告功能，统一数据获取方法
  后台页面小bug修复
 2015-08-08 22:44:30 +08:00
virusdefender 2da1e1426f 增加图表的 css 样式 2015-08-08 22:42:19 +08:00
virusdefender cfd56ab582 Merge branch 'virusdefender-dev' of https://git.coding.net/virusdefender/qduoj into virusdefender-dev 
* 'virusdefender-dev' of https://git.coding.net/virusdefender/qduoj:
 2015-08-08 22:41:18 +08:00
virusdefender e9161e8779 改进监控页面样式，增加 chart.js 库文件 2015-08-08 22:40:12 +08:00
virusdefender 7555f959a6 Accept Merge Request #44 : (virusdefender-dev -> dev) 
Merge Request: 后台模板加载问题修复
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/44
 2015-08-08 09:45:29 +08:00
virusdefender aad9b305ef 增加服务器监控的对应 js 也 demo 页面 2015-08-08 09:44:15 +08:00
virusdefender fff7fae323 修复模板重复加载的问题 
需要在 avalon.ready()之后再进行其他动作，需要先初始化模板路径。
 2015-08-08 09:43:32 +08:00
virusdefender 6e8baca8c9 django rest framework 3.2之后使用 request.data代替 request.DATA 2015-08-07 22:01:16 +08:00
virusdefender f55517d7c6 修复 ci migrate 错误 2015-08-07 21:52:22 +08:00
virusdefender d3e4933865 Merge branch 'virusdefender-dev' into dev 
* virusdefender-dev:
  后台 admin 模板样式优化
 2015-08-07 20:02:29 +08:00
virusdefender 01b13bf823 后台 admin 模板样式优化 2015-08-07 20:02:08 +08:00
virusdefender a1686d4015 Accept Merge Request #41 : (virusdefender-dev -> dev) 
Merge Request: 后台模板加载优化
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/41
 2015-08-07 18:32:51 +08:00
virusdefender b1a935a894 将创建 contest 的页面修改为新的动态加载的方式 2015-08-07 17:13:44 +08:00
virusdefender 1d639d1203 修复后台左侧导航栏的 hash 和 li class 还有模板路径对应关系错误的 bug 2015-08-07 17:13:09 +08:00
virusdefender 2475407597 前台网页增加新的 class，修复 footer 显示位置错误的问题 2015-08-07 17:12:08 +08:00
virusdefender a66b755aa3 修复 footer 显示位置错误的问题 2015-08-07 17:11:20 +08:00
virusdefender d54a7bf818 Merge branch 'dev' into virusdefender-dev 
* dev:
  添加Announcement的API测试，即url中的announcement_list_api，增加公告编辑及相应的API测试
 2015-08-06 23:48:19 +08:00
virusdefender d6a36fe20c 增加模板加载效果和对应的 js 控制 2015-08-06 23:47:54 +08:00
virusdefender ab63ac652f 分离公共 js；修改 footer 效果，固定在底部 2015-08-06 23:47:28 +08:00
virusdefender f94598bdad Accept Merge Request #40 : (hohoTT-dev -> dev) 
Merge Request: 添加Announcement的API测试，即url中的announcement_list_api，增加公告编辑及相应的API测试
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/40
 2015-08-06 19:10:04 +08:00
virusdefender 290212d408 Accept Merge Request #39 : (virusdefender-dev -> dev) 
Merge Request: 修复 announcement url 前缀错误；修复 api doc 格式错误
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/39
 2015-08-06 16:50:21 +08:00
virusdefender 529cea5476 修复 announcement url 前缀错误；修复 api doc 格式错误 2015-08-06 16:49:48 +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
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
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
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
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
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
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
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
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
virusdefender 22d6181471 Accept Merge Request #5 : (virusdefender-dev -> dev) 
Merge Request: virusdefender-dev -> dev
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/5
 2015-08-03 20:03:16 +08:00
virusdefender 5cd58164c9 Accept Merge Request #4 : (hohoTT-dev -> virusdefender-dev) 
Merge Request: 新增用户修改密码和API测试的功能
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/4
 2015-08-03 19:58:48 +08:00
virusdefender b3d5519987 删除 urls 里面多余的 login url[CI SKIP] 2015-08-03 17:14:44 +08:00
virusdefender 8b0ad78b1a 增加检测用户名是否存在的 api 接口和相应测试 2015-08-03 16:52:31 +08:00
virusdefender 798e68509b 修改 js 路径和引用方式 2015-08-02 18:09:28 +08:00
virusdefender cf4ae5aa12 增加题目列表页和部分 ajax js [CI SKIP] 2015-08-02 16:58:41 +08:00
virusdefender 335051dbd4 修复单元测试错误 2015-08-02 14:27:09 +08:00
virusdefender 37529512c9 增加daocloud ci 2015-08-02 14:24:30 +08:00
virusdefender 7ff8ce9504 增加数据库 migrate 2015-08-02 14:07:57 +08:00
virusdefender be675c17a0 修改 js 错误 2015-08-02 14:01:53 +08:00
virusdefender eb686a0f1a 增加启动命令 2015-08-02 12:22:13 +08:00
virusdefender 4fb0bd7945 自动排除了 lib，导致js 不全 2015-08-02 12:21:12 +08:00
virusdefender 477fc68ae2 换回 python 环境 2015-08-02 11:55:44 +08:00
virusdefender a039ff333d 更换 docker 环境 2015-08-02 11:47:32 +08:00
virusdefender d2c19e91d4 修改 dockerfile 2015-08-02 11:07:08 +08:00
virusdefender d94d472e21 自动创建 LOG 文件夹 2015-08-02 10:59:01 +08:00
virusdefender 348aaa53d1 another typo 2015-08-02 10:56:12 +08:00
virusdefender 4b0fdb5495 typo 2015-08-02 10:54:18 +08:00
virusdefender ebbbc857b5 dockerfile 里面的 typo 2015-08-02 10:52:36 +08:00
virusdefender 61153fda06 测试 docker 运行 2015-08-02 10:49:31 +08:00
virusdefender adaacb6086 增加coding演示配置文件 2015-08-02 10:18:19 +08:00