 cxt
|
bf634b56e1
|
实训统计调整
|
2017-09-26 15:53:17 +08:00 |
|
cxt
|
31f199a3f6
|
实训统计调整
|
2017-09-26 15:13:57 +08:00 |
|
cxt
|
016741ed35
|
超级管理员的实训作业统计
|
2017-09-26 14:31:04 +08:00 |
 daiao
|
539902fa79
|
超级管理员导出EXCEL
|
2017-09-25 08:56:51 +08:00 |
|
cxt
|
3f3f3804ba
|
Merge branch 'dev_cs' into develop
|
2017-09-22 21:10:31 +08:00 |
|
cxt
|
4d408ded24
|
添加教师的调整
|
2017-09-22 21:09:35 +08:00 |
|
cxt
|
5fc722a5cd
|
添加学生的弹框调整
|
2017-09-22 20:37:44 +08:00 |
 huang
|
2ac8536575
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 19:05:56 +08:00 |
|
huang
|
759cda61b9
|
实训复制权限及复制的时候没有复制适用课程
|
2017-09-22 19:05:37 +08:00 |
|
cxt
|
186faac00d
|
搜索翻页
|
2017-09-22 18:48:52 +08:00 |
 XuCheng642
|
23550b8923
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/controllers/managements_controller.rb
|
2017-09-22 18:48:03 +08:00 |
|
XuCheng642
|
5cd22581ba
|
管理员界面修改
|
2017-09-22 18:40:22 +08:00 |
 caishi
|
78874ff0cc
|
Merge branch 'dev_cs' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/helpers/student_work_helper.rb
app/views/courses/sync_students.js.erb
|
2017-09-22 17:12:37 +08:00 |
|
huang
|
a234bdc01b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 10:47:41 +08:00 |
|
huang
|
3df0b71d0f
|
复制的时候添加错误提醒
|
2017-09-22 10:09:34 +08:00 |
|
huang
|
8457e4d784
|
完成实训的复制功能
|
2017-09-22 09:52:13 +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
|
0b38eca942
|
实训作业的完成情况实时更新
|
2017-09-21 15:50:08 +08:00 |
|
daiao
|
833be4dbaa
|
训路径的简介、学习须知，请改为 ke 编辑器
|
2017-09-20 11:16:26 +08:00 |
|
cxt
|
ac667c5583
|
教辅申请加入课堂、老师批准，请给教师发留言
|
2017-09-20 11:09:32 +08:00 |
|
huang
|
ea29e79365
|
Merge branch 'develop' into dev_huang
|
2017-09-19 17:29:32 +08:00 |
|
cxt
|
cb9e28f907
|
提示文字的修改
|
2017-09-18 15:16:03 +08:00 |
|
daiao
|
9161d4c065
|
课程导出excel
|
2017-09-18 14:46:18 +08:00 |
|
cxt
|
c8a484f109
|
删除分班后，左侧菜单栏没有刷新
|
2017-09-18 14:25:42 +08:00 |
|
huang
|
1ec289c197
|
Merge branch 'develop' into dev_huang
|
2017-09-18 10:32:02 +08:00 |
|
huang
|
4e30c42a60
|
导入结果弹框提醒
|
2017-09-15 22:59:32 +08:00 |
|
huang
|
87d47fe672
|
成员管理弹框数据统计
|
2017-09-15 22:35:40 +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 |