 daiao
|
833be4dbaa
|
训路径的简介、学习须知，请改为 ke 编辑器
|
2017-09-20 11:16:26 +08:00 |
 cxt
|
cb9e28f907
|
提示文字的修改
|
2017-09-18 15:16:03 +08:00 |
|
daiao
|
9161d4c065
|
课程导出excel
|
2017-09-18 14:46:18 +08:00 |
|
cxt
|
61f1d9bd10
|
课堂相关修改
|
2017-09-15 22:35:36 +08:00 |
|
cxt
|
3a394315a4
|
班级头部的学生列表链接更新
|
2017-09-15 21:25:16 +08:00 |
|
cxt
|
be1e82a52b
|
gemfile
|
2017-09-15 21:07:47 +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 |
|
cxt
|
b0cab589ac
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 21:02:48 +08:00 |
|
cxt
|
a69dc16af5
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
Conflicts:
app/views/courses/settings/_all_student_list_block.html.erb
|
2017-09-15 21:02:10 +08:00 |
|
cxt
|
d2d388972a
|
班级页面的分班
|
2017-09-15 20:59:35 +08:00 |
 huang
|
730e8264c0
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
Conflicts:
app/controllers/courses_controller.rb
app/views/courses/settings/_all_student_list.html.erb
|
2017-09-15 19:09:31 +08:00 |
|
huang
|
d713ce6de0
|
批量导入Excel文件到课程列表
|
2017-09-15 19:03:36 +08:00 |
 caishi
|
e138c204e0
|
分班
|
2017-09-15 17:08:16 +08:00 |
|
cxt
|
c9216387a6
|
学生退出班级后再重新加入班级无法提交作品
|
2017-09-15 16:31:22 +08:00 |
|
cxt
|
508139c57c
|
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 15:12:09 +08:00 |
|
cxt
|
6469fc1563
|
课堂的调整
|
2017-09-15 15:10:35 +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 |
|
huang
|
63cd1ba6ab
|
新
|
2017-09-15 10:50:05 +08:00 |
|
huang
|
0f2bb1734f
|
excel解析用户
|
2017-09-14 19:58:13 +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 |
|
huang
|
604a5cf75a
|
excel解析批量导入
|
2017-09-13 17:16:09 +08:00 |
|
cxt
|
8a6e2ac0f0
|
在线课堂的全部课堂数量包含归档的
|
2017-09-08 21:44:46 +08:00 |
|
cxt
|
90d4a9034a
|
分班成绩导出报500
|
2017-09-08 15:06:54 +08:00 |
|
cxt
|
5678fbfccb
|
在线课堂首页筛选修改
|
2017-09-06 16:08:56 +08:00 |
|
daiao
|
888bd440e2
|
上线缺陷修复
|
2017-09-01 19:21:00 +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 |
|
cxt
|
43eafaf095
|
新建课堂修删除专业等信息，简洁化
|
2017-08-29 17:31:28 +08:00 |
|
daiao
|
752e9799f4
|
全部实训和在线课堂的搜索icon点开之后显示不一致
|
2017-08-29 14:16:28 +08:00 |
|
XuCheng642
|
8f74cc4b42
|
iuuue
|
2017-08-29 09:08:15 +08:00 |
|
cxt
|
f82b8f0e20
|
班级讨论区的上线
|
2017-07-28 16:59:17 +08:00 |
|
cxt
|
293997b2da
|
班级添加学生
|
2017-07-21 20:00:12 +08:00 |
|
daiao
|
7c02bad6ca
|
查看归档点击后，显示的是归档课程，所以头部的“全部课堂”“我的课堂”最好也联动更新，使整个页面的数据和显示保持一致。返回后恢复
|
2017-07-21 14:27:54 +08:00 |
|
daiao
|
06f73b6c82
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/courses/index.html.erb
app/views/shixuns/_form.html.erb
|
2017-07-21 10:00:45 +08:00 |
|
daiao
|
65331b99f5
|
课程实训首页的“查看归档”功能
|
2017-07-17 16:14:09 +08:00 |
|
cxt
|
f110f7b7b5
|
班级设置页面添加学生点击搜索按钮无数据显示
|
2017-07-17 15:29:24 +08:00 |
|
cxt
|
1f85875f9d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/courses/index.html.erb
|
2017-07-07 18:23:20 +08:00 |
|
daiao
|
ffbe5af7f1
|
在title搜索框中搜索实训出来的数据会影响全部实训的数据显示
|
2017-07-06 09:11:43 +08:00 |
|
cxt
|
550b516799
|
在班级学生成员列表页面点击导出成绩，跳转500
|
2017-07-04 15:26:10 +08:00 |
|
cxt
|
8b965bbfc3
|
班级设置修改后点击保存需要给出提示框
|
2017-07-03 11:25:18 +08:00 |
|
cxt
|
51c562f596
|
去掉课堂教学中已删除的班级
|
2017-06-30 19:55:31 +08:00 |
|
cxt
|
22a5d80e41
|
课堂教学首页的排序按成员数量排序
|
2017-06-30 19:18:03 +08:00 |
|
cxt
|
ab4a8136c4
|
课堂首页的排序
|
2017-06-30 19:10:49 +08:00 |
|
daiao
|
48ec5c6f81
|
“课堂教学”首页的显示更新
|
2017-06-30 14:39:56 +08:00 |
|
cxt
|
621b2023f5
|
隐藏班级动态中未实现的部分
|
2017-06-23 16:24:06 +08:00 |
|
huang
|
8f40d7022a
|
修复登录等问题
|
2017-06-11 15:45:54 +08:00 |
|
cxt
|
650d8016a0
|
加入班级时选择身份为教师或助教，教师界面没有相关的审核（新建班级）
|
2017-06-09 16:51:32 +08:00 |
|
daiao
|
82cb879706
|
智能课堂的筛选样式更换
|
2017-06-07 16:13:46 +08:00 |
|
daiao
|
f6da468f26
|
智能课堂首页的调整
|
2017-06-02 19:22:29 +08:00 |