 cxt
|
3d0f1839a7
|
Merge branch 'dev_cs' into develop
Conflicts:
app/views/challenges/_single_or_multiple_question.html.erb
app/views/messages/_common_reply_box.html.erb
app/views/praise_tread/_edu_praise.html.erb
app/views/student_work/_common_reply_box.html.erb
|
2017-09-15 21:05:56 +08:00 |
|
cxt
|
b0cab589ac
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 21:02:48 +08:00 |
 daiao
|
7ac17f10bd
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 19:29:09 +08:00 |
|
daiao
|
550f152e27
|
单选多选题
|
2017-09-15 19:28:19 +08:00 |
 XuCheng642
|
ac28f83271
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/controllers/managements_controller.rb
app/helpers/application_helper.rb
app/views/subjects/_subject_list.html.erb
config/routes.rb
|
2017-09-15 18:35:37 +08:00 |
|
cxt
|
c9216387a6
|
学生退出班级后再重新加入班级无法提交作品
|
2017-09-15 16:31:22 +08:00 |
 huang
|
3e07f18be5
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
Conflicts:
app/views/courses/settings/_all_student_list.html.erb
|
2017-09-15 10:55:32 +08:00 |
|
daiao
|
ec22bbe0c1
|
Merge branch 'develop' into dev_daiao
Conflicts:
app/controllers/games_controller.rb
app/views/challenges/edit.html.erb
app/views/games/_game_show.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-15 09:10:36 +08:00 |
|
huang
|
0f2bb1734f
|
excel解析用户
|
2017-09-14 19:58:13 +08:00 |
|
XuCheng642
|
f9e4385226
|
问题修改2017 09 11
|
2017-09-14 19:24:47 +08:00 |
|
daiao
|
ab3cfc69bd
|
TPI单选多选题，全部列表刷新
|
2017-09-14 18:59:41 +08:00 |
|
daiao
|
2c7e5d1f38
|
TPI单选多选题
|
2017-09-14 17:30:58 +08:00 |
|
daiao
|
f79a40ca65
|
单选多选题
|
2017-09-13 16:01:18 +08:00 |
|
daiao
|
a27f10d884
|
选择题的新建和详情页面
|
2017-09-12 09:05:51 +08:00 |
|
XuCheng642
|
dca722c5dd
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into dev_xucheng
Conflicts:
app/views/syllabuses/index.html.erb
|
2017-09-08 19:11:24 +08:00 |
|
XuCheng642
|
c2f09a4989
|
issue修改
|
2017-09-08 18:35:45 +08:00 |
|
huang
|
2b1516558f
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-08 15:53:47 +08:00 |
|
cxt
|
a376140d75
|
Merge branch 'dev_cxt' into develop
|
2017-09-08 15:50:21 +08:00 |
|
huang
|
159a91878f
|
解决异常问题
|
2017-09-08 15:49:48 +08:00 |
|
cxt
|
a8cf183944
|
完成实训作业的自动评分功能
|
2017-09-08 15:48:35 +08:00 |
|
huang
|
9fe9095837
|
优化开启实训方法；解决实训偶尔被fork多次的问题；解决开启实训的时候版本库为空的问题
|
2017-09-08 14:53:36 +08:00 |
|
cxt
|
bfe20231e8
|
实训作业的评分
|
2017-09-08 13:04:47 +08:00 |
|
daiao
|
0bc86d9bd7
|
实训TPI的评测按钮区域新增“上一关”
|
2017-09-08 11:21:08 +08:00 |
|
cxt
|
143a16e943
|
实训还在挑战第一关，实训作业关联实战后显示数据不对，且查看操作无效果（双重身份）
|
2017-09-07 17:54:51 +08:00 |
|
daiao
|
0b1f6f5378
|
实训TPI代码评测修改为代码抛异常和代码实际输出与测试集输出不匹配2种类型
|
2017-09-07 14:22:12 +08:00 |
|
cxt
|
0ae0f38450
|
班级页面点击加入题库后，我的题库中数据没有刚加入的数据
|
2017-09-07 11:25:21 +08:00 |
|
cxt
|
0cb964b237
|
超级管理员的试用申请显示信息有点问题
|
2017-09-06 15:32:54 +08:00 |
|
daiao
|
81c396757c
|
实训单选多选题
|
2017-09-05 08:50:10 +08:00 |
|
cxt
|
e21b787952
|
修改密码和注册激活邮件的调整
|
2017-09-04 16:58:50 +08:00 |
|
daiao
|
55e76fa35b
|
单选题，多选题
|
2017-09-04 14:57:34 +08:00 |
|
XuCheng642
|
ed8a1e4510
|
Merge branch 'dev_xucheng' into develop
Conflicts:
app/controllers/managements_controller.rb
app/views/courses/new.html.erb
app/views/users/show.html.erb
config/routes.rb
|
2017-09-01 19:44:19 +08:00 |
|
XuCheng642
|
bb9fb39396
|
缺陷修复
|
2017-09-01 19:37:09 +08:00 |
|
cxt
|
a087cc809a
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/courses/index.html.erb
app/views/courses/index.js.erb
app/views/subjects/_subject_list.html.erb
app/views/subjects/show.html.erb
|
2017-09-01 15:06:18 +08:00 |
|
huang
|
7580ec6478
|
实训pod关联
|
2017-09-01 08:58:06 +08:00 |
|
huang
|
e60582787d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/games/_code_actions.html.erb
|
2017-08-31 16:38:07 +08:00 |
|
huang
|
328e7236a9
|
完成跳关打实训
|
2017-08-30 17:30:32 +08:00 |
|
cxt
|
75522ab120
|
在线课堂删除课程的联动更新：题库新建的tip和适用课程的输入可选列表，题库只显示普通和实训的作业
|
2017-08-30 14:39:44 +08:00 |
|
cxt
|
43eafaf095
|
新建课堂修删除专业等信息，简洁化
|
2017-08-29 17:31:28 +08:00 |
|
daiao
|
dde055fd3a
|
实训TPI提示等待时间信息
|
2017-08-29 17:07:11 +08:00 |
|
daiao
|
7e03296bea
|
管理员只看支撑实训
|
2017-08-27 11:18:18 +08:00 |
|
huang
|
57722df834
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/shixuns/_form.html.erb
|
2017-08-25 16:37:05 +08:00 |
|
XuCheng642
|
d0181f80b7
|
Merge branch 'dev_xucheng' into develop
|
2017-08-25 16:25:12 +08:00 |
|
cxt
|
a944456e57
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/subjects/_subject_list.html.erb
|
2017-08-25 16:13:46 +08:00 |
|
XuCheng642
|
f54453f32c
|
管理员界面新增专业
|
2017-08-25 16:11:35 +08:00 |
|
cxt
|
20b509a985
|
镜像管理的删除
|
2017-08-25 15:50:00 +08:00 |
|
huang
|
77af9910f1
|
实训新建的时候添加webssh勾选项
|
2017-08-25 14:50:15 +08:00 |
|
cxt
|
49bbd36c12
|
实训套件的改版
|
2017-08-24 20:01:34 +08:00 |
|
cxt
|
71d8fd4420
|
镜像管理相关
|
2017-08-24 17:32:05 +08:00 |
|
XuCheng642
|
0d4c234d51
|
支撑实训和新增实训页面列表的修改
|
2017-08-24 11:32:48 +08:00 |
|
daiao
|
4e7205a5a0
|
非合作成员点击TPM的任务列表，请进入TPI页面
|
2017-08-23 15:05:57 +08:00 |