 daiao
|
a5289610a3
|
实训TPI的回复
|
2017-09-30 19:23:38 +08:00 |
|
daiao
|
71e7725e5c
|
贴吧
|
2017-09-26 08:40:27 +08:00 |
 cxt
|
5f185c0cd7
|
课堂作业的“挂起”改为未发布
|
2017-09-25 10:40:34 +08:00 |
|
daiao
|
ced586aca9
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 17:29:55 +08:00 |
|
daiao
|
8e9b719b0f
|
实训的每一关要增加开始玩、玩的入口
|
2017-09-22 17:29:25 +08:00 |
|
cxt
|
42351bc93d
|
Merge branch 'dev_cxt' into dev_cs
Conflicts:
app/views/layouts/_group_children_list.html.erb
app/views/subjects/new.html.erb
|
2017-09-22 14:56:43 +08:00 |
|
cxt
|
0f69140692
|
作品列表中的匿评作品按钮需要删除
|
2017-09-22 14:45:20 +08:00 |
|
cxt
|
48de3d1f35
|
实训作业成绩的实时更新
|
2017-09-22 14:36:01 +08:00 |
|
cxt
|
ac92ba649d
|
作业
|
2017-09-22 11:18:12 +08:00 |
|
cxt
|
2a619272bb
|
实训作业选择bug和延时提交
|
2017-09-22 11:16:30 +08:00 |
 caishi
|
b4b296d130
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/challenges/_single_or_multiple_question_show.html.erb
|
2017-09-22 08:51:34 +08:00 |
|
caishi
|
219ff96ea0
|
增加在线课堂的教师或者助教待审批提醒，且更换样式
|
2017-09-21 18:29:07 +08:00 |
|
cxt
|
86e2f60946
|
Merge branch 'develop' into dev_cxt
Conflicts:
app/controllers/shixuns_controller.rb
app/views/subjects/new.html.erb
public/javascripts/edu/base_edu.js
|
2017-09-21 17:46:58 +08:00 |
|
cxt
|
6e5ff7cc9a
|
继续实战
|
2017-09-21 17:17:53 +08:00 |
|
cxt
|
df5b70a558
|
继续实战报500
|
2017-09-21 17:07:21 +08:00 |
|
cxt
|
33580f1e20
|
增加实训平台“verilog”
|
2017-09-21 15:51:47 +08:00 |
|
cxt
|
0b38eca942
|
实训作业的完成情况实时更新
|
2017-09-21 15:50:08 +08:00 |
|
caishi
|
b5c7c5a8d8
|
班级添加学生、教师默认只添加与主讲人所在单位一致的学生
|
2017-09-21 11:19:44 +08:00 |
|
cxt
|
cefc5edbfe
|
实训路径的简介、学习须知，请改为 ke 编辑器，需要插入图片
|
2017-09-21 11:07:44 +08:00 |
|
caishi
|
da6d67eb35
|
动态资源列表、讨论列表调整
|
2017-09-20 14:27:13 +08:00 |
|
cxt
|
113df24943
|
作业列表请显示发布时间
|
2017-09-20 11:23:25 +08:00 |
|
cxt
|
0023e8b32f
|
在线课堂-作业挂起时请显示设置的发布时间
|
2017-09-18 10:42:30 +08:00 |
 miss
|
5ee33d6f8e
|
前端测试集的显示语提示语
|
2017-09-17 15:12:38 +08:00 |
|
daiao
|
055a254811
|
测试集样式修改
|
2017-09-17 11:24:57 +08:00 |
|
daiao
|
39064be34b
|
刷新测试集提示样式修改
|
2017-09-17 11:08:03 +08:00 |
|
cxt
|
a412a42976
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/helpers/courses_helper.rb
|
2017-09-15 22:53:47 +08:00 |
|
caishi
|
174cca8e6d
|
Merge branch 'dev_cs' into develop
|
2017-09-15 22:46:13 +08:00 |
|
caishi
|
a4d0c65cad
|
课堂样式
|
2017-09-15 22:44:36 +08:00 |
|
cxt
|
61f1d9bd10
|
课堂相关修改
|
2017-09-15 22:35:36 +08:00 |
|
cxt
|
3a394315a4
|
班级头部的学生列表链接更新
|
2017-09-15 21:25:16 +08:00 |
 huang
|
bfe758be78
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata 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:13:14 +08:00 |
|
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 |
 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 |
|
caishi
|
15d9e878f4
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-09-15 15:24:21 +08:00 |
|
caishi
|
26e88c72f0
|
作业列表页面修改
|
2017-09-15 15:23:51 +08:00 |
|
cxt
|
6469fc1563
|
课堂的调整
|
2017-09-15 15:10:35 +08:00 |
|
XuCheng642
|
d33e79dc86
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/controllers/managements_controller.rb
|
2017-09-14 19:30:36 +08:00 |
|
XuCheng642
|
f9e4385226
|
问题修改2017 09 11
|
2017-09-14 19:24:47 +08:00 |
|
cxt
|
86f6bbcac8
|
课堂相关调整
|
2017-09-14 14:48:04 +08:00 |
|
caishi
|
5039ce09d8
|
Merge branch 'develop' into dev_cs
|
2017-09-13 10:17:54 +08:00 |
|
caishi
|
d67eb13c9b
|
在线课堂页面的更新
|
2017-09-13 10:16:35 +08:00 |
|
cxt
|
0a774e793f
|
测试
|
2017-09-12 17:37:53 +08:00 |
|
cxt
|
e87bc406a6
|
添加日志
|
2017-09-12 17:32:50 +08:00 |
|
cxt
|
14e8474bad
|
实训作业的查看弹框，耗时显示有问题
|
2017-09-11 15:59:36 +08:00 |
|
cxt
|
4adb8cbab6
|
实训作业的评分调整
|
2017-09-11 15:48:02 +08:00 |
|
caishi
|
7f0bdd9c73
|
Merge branch 'develop' into dev_cs
Conflicts:
app/controllers/shixuns_controller.rb
app/views/layouts/base_edu_course.html.erb
app/views/shixuns/_shixun_top.html.erb
app/views/shixuns/search_user_courses.js.erb
public/stylesheets/css/edu-common.css
|
2017-09-11 11:28:26 +08:00 |
|
cxt
|
f26beb7e18
|
在线课堂首页的500
|
2017-09-08 17:21:25 +08:00 |
|
caishi
|
eb6844e293
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/challenges/edit.html.erb
app/views/homework_common/_show_score_setting.html.erb
app/views/homework_common/setting.html.erb
app/views/layouts/base_courses.html.erb
app/views/layouts/base_edu.html.erb
app/views/layouts/base_edu_course.html.erb
app/views/shixuns/_send_shixuns.html.erb
app/views/shixuns/_shixun_top.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-08 16:48:11 +08:00 |
|
cxt
|
a8cf183944
|
完成实训作业的自动评分功能
|
2017-09-08 15:48:35 +08:00 |
|
cxt
|
bfe20231e8
|
实训作业的评分
|
2017-09-08 13:04:47 +08:00 |