 huang
|
c33ab7735f
|
任务发送修改
|
2017-02-24 19:16:43 +08:00 |
 cxt
|
ca706f3df5
|
从题库选用作业：编程作业变成普通作业时，编程相关的属性设置还存在
|
2017-02-24 19:11:29 +08:00 |
|
huang
|
821dbe0ac2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-24 18:59:54 +08:00 |
|
cxt
|
73f64e80a8
|
班级作业：新建作业时“从题库选用”编程作业，如图报500
|
2017-02-24 18:32:09 +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 |
 daiao
|
e3d0551e51
|
合作伙伴的开源软件链接更为不可点击跳转
|
2017-02-24 16:35:48 +08:00 |
|
daiao
|
f4ea11c4c2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 16:20:38 +08:00 |
|
daiao
|
d05b3419d7
|
项目列表样式调整
|
2017-02-24 16:20:12 +08:00 |
|
陈晓婷
|
367dfbadee
|
Merge branch 'develop' into 'develop'
报500
See merge request !157
|
2017-02-24 16:18:23 +08:00 |
|
cxt
|
544dfd356e
|
竞赛、课程、项目列表报500
|
2017-02-24 16:15:23 +08:00 |
|
黄井泉
|
af959a1260
|
Merge branch 'develop' into 'develop'
本周上线任务
See merge request !156
|
2017-02-24 15:35:17 +08:00 |
|
huang
|
c613e29299
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-24 15:33:51 +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 |
|
daiao
|
91017041ac
|
组织底部导航修改
|
2017-02-24 15:06:48 +08:00 |
|
daiao
|
a1fee68d8b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 14:56:44 +08:00 |
|
daiao
|
4c21ef8004
|
css样式添加
|
2017-02-24 14:54:15 +08:00 |
|
daiao
|
47017f875a
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 14:52:06 +08:00 |
|
daiao
|
a8588a5670
|
课程样式调整
|
2017-02-24 14:51:44 +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
|
6e96f6e9ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-24 13:52:18 +08:00 |
|
huang
|
2e09695d79
|
Merge branch 'dev_raining' into develop
|
2017-02-24 13:50:39 +08:00 |
|
huang
|
d76e34889a
|
task不重复执行
|
2017-02-24 13:42:58 +08:00 |
|
huang
|
30c14c2e07
|
任务启动回调逻辑控制
|
2017-02-24 12:30:36 +08:00 |
|
cxt
|
cee2569796
|
作业定时发布的任务调整
|
2017-02-24 11:05:27 +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
|
38e6b098c3
|
回复为0不显示
|
2017-02-24 10:01:08 +08:00 |
|
huang
|
bd2d0d3869
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
Conflicts:
app/views/training_tasks/_content_list.html.erb
|
2017-02-24 09:58:52 +08:00 |
|
daiao
|
c76db2cb24
|
项目问题动态回复功能修复
|
2017-02-24 09:56:58 +08:00 |
|
daiao
|
9e7ce0fd6a
|
实训任务样式调整
|
2017-02-24 09:41:15 +08:00 |
|
huang
|
658023cbe0
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 09:04:07 +08:00 |
|
daiao
|
4885ec5afb
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 17:26:35 +08:00 |
|
daiao
|
9697a9b5c1
|
实训项目展开/收起回复加载KE
|
2017-02-23 17: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 |
 Linda
|
2fb75fdb4d
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 17:14:32 +08:00 |
|
Linda
|
b369b9c281
|
实训任务标题样式修改
|
2017-02-23 17:13:56 +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
|
f817aef5d2
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 16:13:16 +08:00 |
|
daiao
|
1e56a69eed
|
动态消息的实训动态添加回复/二级回复功能
|
2017-02-23 16:12:29 +08:00 |
|
Linda
|
95f06e50ff
|
实训任务动态标题样式修改
|
2017-02-23 16:01:23 +08:00 |
|
huang
|
6bd160d642
|
样式问题
|
2017-02-23 15:46:07 +08:00 |
|
huang
|
0e48262407
|
动态中提交评测ajax局部刷新
|
2017-02-23 15:27:10 +08:00 |