 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 |
|
huang
|
45e9155eb9
|
Merge branch 'dev_cs' into develop
|
2017-09-15 21:08:48 +08:00 |
|
huang
|
17886c7313
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-09-15 21:06:59 +08:00 |
|
huang
|
04d2067b0e
|
解决版本库500问题
|
2017-09-15 21:06:42 +08:00 |
 daiao
|
53b015606c
|
单选多选题错误提示修改
|
2017-09-15 20:53:41 +08:00 |
|
daiao
|
f659047c4d
|
试用申请待处理期间，增加弹框提示
|
2017-09-15 20:45:00 +08:00 |
|
daiao
|
39b16c9d29
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 20:32:30 +08:00 |
|
daiao
|
0a1359d7a3
|
检索为空时，点击点击叉叉，也会刷新页面
|
2017-09-15 20:32:15 +08:00 |
 miss
|
5d9ec8bf0c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 20:24:17 +08:00 |
|
miss
|
c51832e2bd
|
tip样式的调整
|
2017-09-15 20:23:49 +08:00 |
|
daiao
|
c6a7362051
|
在线课堂的加入学生、老师弹框，实训tpm的添加合作者显示的用户职业不正确
|
2017-09-15 20:20:01 +08:00 |
 caishi
|
c2dec1bddc
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-09-15 20:12:52 +08:00 |
|
caishi
|
c841ec27ba
|
选择题
|
2017-09-15 20:12:24 +08:00 |
|
huang
|
9f10b14466
|
合并代码后添加入口
|
2017-09-15 19:41:10 +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 |
|
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 |
 XuCheng642
|
2d1a24ea68
|
Merge branch 'dev_xucheng' into develop
|
2017-09-15 18:38:29 +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
|
2f52d3456e
|
Merge branch 'dev_daiao' into dev_cs
|
2017-09-15 18:29:34 +08:00 |
|
caishi
|
8d42926389
|
选择题编辑、详情
|
2017-09-15 18:28:30 +08:00 |
|
XuCheng642
|
1240c50cb5
|
班级帖子发送样式
|
2017-09-15 18:17:19 +08:00 |
|
miss
|
ac2af05d28
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 18:13:14 +08:00 |
|
caishi
|
e138c204e0
|
分班
|
2017-09-15 17:08:16 +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
|
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 |
|
daiao
|
02861c3bd2
|
单选多选题缺陷修复
|
2017-09-15 11:23:24 +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 |
|
daiao
|
a6845d79b0
|
Merge branch 'dev_daiao' into develop
|
2017-09-15 10:40:05 +08:00 |
|
daiao
|
0204232e49
|
导出excel
|
2017-09-15 10:39:07 +08:00 |
|
caishi
|
ca558efac1
|
上传学生信息文件
|
2017-09-15 10:12:42 +08:00 |
|
daiao
|
05553faf7d
|
实训tip按钮修改
|
2017-09-15 10:00:05 +08:00 |
|
caishi
|
d3a5594f7c
|
选择题选项问题
|
2017-09-15 09:42:49 +08:00 |
|
daiao
|
67fa2021c5
|
实训tab页一律不要弹出新的浏览器页面
|
2017-09-15 09:33:18 +08:00 |
|
caishi
|
efd402bed5
|
Merge branch 'dev_daiao' into dev_cs
Conflicts:
app/views/challenges/edit.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-15 09:29:42 +08:00 |
|
daiao
|
44e99157b5
|
实训TPI报500
|
2017-09-15 09:24:08 +08:00 |
|
daiao
|
d2e03de9eb
|
匿评作业报500
|
2017-09-15 09:13:28 +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 |
|
miss
|
25cb688ace
|
测试集前端显示空格及提示语
|
2017-09-15 09:08:01 +08:00 |
|
caishi
|
990480e29b
|
Merge branch 'develop' into dev_cs
|
2017-09-15 09:05:25 +08:00 |
|
huang
|
0f2bb1734f
|
excel解析用户
|
2017-09-14 19:58:13 +08:00 |
|
daiao
|
a67f4ca0f7
|
实训单选多选题TPM优化
|
2017-09-14 19:41:30 +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 |
|
daiao
|
ab3cfc69bd
|
TPI单选多选题，全部列表刷新
|
2017-09-14 18:59:41 +08:00 |
|
daiao
|
9dc48292eb
|
单选多选题
|
2017-09-14 18:45:19 +08:00 |