jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,857 Commits 98 Branches 0 Tags 0 B
Commit Graph

5616 Commits

Author SHA1 Message Date
daiao abcaf33a17 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-02 09:45:45 +08:00
huang 3582f70a6b 局部刷新测试 2017-03-01 16:53:01 +08:00
daiao 20cc376246 注册激活页面的更换邮箱，更换一次之后，第二次弹框显示的原邮箱不正确 2017-03-01 15:51:12 +08:00
huang 7763ce0d66 添加数据 2017-02-28 21:56:39 +08:00
huang cfd2161756 改动sleep时间 2017-02-28 21:11:14 +08:00
huang 7804ea69bd 项目动态ajax刷新 2017-02-28 20:50:40 +08:00
huang be1b507354 ajax刷新 2017-02-28 17:22:00 +08:00
huang 5740204301 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-28 09:56:13 +08:00
huang ada7962231 成功的时候才更新状态 2017-02-28 09:55:42 +08:00
daiao 5e4c96e864 Issue回复的@功能失效了 2017-02-28 09:32:20 +08:00
huang 1f3a13b933 任务提醒描述修改 2017-02-27 17:22:10 +08:00
huang 3bda887144 修改position提示 2017-02-26 22:50:34 +08:00
huang fce24d11a9 gitUrl转码 2017-02-26 20:51:25 +08:00
huang e2280d5da7 传gitlab地址 2017-02-26 20:44:44 +08:00
huang aec9a1dcce msg 解码； 传gitUrl 2017-02-26 20:37:02 +08:00
huang 4127022891 修改参数名 2017-02-25 19:55:47 +08:00
huang 011a0d7d36 添加任务序号 2017-02-25 19:43:49 +08:00
huang f459609c81 解决实训任务验证问题 用户名后添加导师 2017-02-25 11:08:37 +08:00
黄井泉 8d41cecf72 Merge branch 'guange_dev' into 'develop' 
任务状态去掉认证



See merge request !159
 2017-02-24 22:19:35 +08:00
guange 6e827a3a8c 任务状态去掉认证 2017-02-24 22:16:35 +08:00
huang 9f92eff178 task编辑问题 2017-02-24 22:09:25 +08:00
huang 5be7e048cf 没登陆情况不允许开启任务 2017-02-24 21:21:48 +08:00
cxt 1c7bbbf88d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 20:40:25 +08:00
cxt a6bf791358 讨论区如图分页当前页为最后一页，点击下一页建议返回第一页 2017-02-24 20:38:49 +08:00
cxt 6d3ab4f651 竞赛通知和班级通知不能回复 2017-02-24 20:00:31 +08:00
huang c33ab7735f 任务发送修改 2017-02-24 19:16:43 +08:00
huang 374323eb32 已经实训过的跳转问题 2017-02-24 17:43:43 +08:00
cxt 29e22f0c6c 刚新建的班级作业，评分设置中最终得分“助教+匿评”的默认比例错了 2017-02-24 17:42:15 +08:00
cxt e658a5426d 班级作业加入题库，题库中该作业的引用数是零 2017-02-24 17:18:32 +08:00
黄井泉 af959a1260 Merge branch 'develop' into 'develop' 
本周上线任务



See merge request !156
 2017-02-24 15:35:17 +08:00
huang bd0bd02084 权限控制 2017-02-24 15:33:15 +08:00
cxt 099fcde246 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2017-02-24 15:20:34 +08:00
cxt 01484701d2 竞赛首页的简介下方直接显示竞赛动态 2017-02-24 15:14:09 +08:00
huang 2e81633308 TPM TPi权限控制 2017-02-24 14:46:29 +08:00
cxt 3e3ad381b1 竞赛：改了提交截止日期，显示的还是提交已截止 2017-02-24 14:29:41 +08:00
huang d76e34889a task不重复执行 2017-02-24 13:42:58 +08:00
huang 30c14c2e07 任务启动回调逻辑控制 2017-02-24 12:30:36 +08:00
cxt 0e40bf6daf 题库改版 2017-02-24 10:32:48 +08:00
huang 6e9ef8ee12 Merge branch 'develop' into dev_raining 
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/_base_project_top.html.erb
 2017-02-24 10:26:22 +08:00
huang 7074cbdba6 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:24:12 +08:00
huang 019ce762f8 针对实训子项目，一些权限修改 2017-02-23 17:23:52 +08:00
daiao 75f1fc964a 实训任务项目动态展开更多与收起回复功能 2017-02-23 17:09:22 +08:00
huang 705f94428e Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 16:18:16 +08:00
huang 49f63992d8 任务开启的时候权限控制 2017-02-23 16:17:37 +08:00
daiao 1e56a69eed 动态消息的实训动态添加回复/二级回复功能 2017-02-23 16:12:29 +08:00
huang 6f06fde7dc Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 14:13:47 +08:00
huang 727a6fd536 实训项目一些封装 2017-02-23 14:13:25 +08:00
daiao 31d852cd60 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 13:40:07 +08:00
daiao 6d14cb131a 问吧右下角贴吧排序按照帖子发布数和回帖数之和排序 2017-02-23 13:39:44 +08:00
huang 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +08:00