 caishi
|
ee237d08eb
|
Merge branch 'develop' into dev_cs
|
2017-09-22 21:02:00 +08:00 |
|
caishi
|
23de636623
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 20:44:05 +08:00 |
|
caishi
|
ecd081030b
|
成员管理数字跳转
|
2017-09-22 20:42:58 +08:00 |
 miss
|
25b593700f
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 20:35:34 +08:00 |
|
miss
|
60d04af7c6
|
问题的修改
|
2017-09-22 20:35:09 +08:00 |
 XuCheng642
|
6f17f97c4d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 20:26:43 +08:00 |
|
XuCheng642
|
1d68147b79
|
Merge branch 'dev_xucheng' into develop
|
2017-09-22 20:26:19 +08:00 |
|
XuCheng642
|
6a142641b6
|
管理员界面消息列表
|
2017-09-22 20:24:43 +08:00 |
 daiao
|
5fcb1f18c4
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 20:06:05 +08:00 |
|
daiao
|
0e253c4e9f
|
实训关卡得分默认值设置为100分，并迁移以往分数为空的数据
|
2017-09-22 20:05:48 +08:00 |
 huang
|
fddf4b302a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 20:04:49 +08:00 |
|
huang
|
7cc12f034d
|
已发布实训版本库控制权限迁移
|
2017-09-22 20:04:32 +08:00 |
|
huang
|
a95cef0599
|
实训发布改成除了超级管理员外，其他成员不允许修改
|
2017-09-22 20:04:09 +08:00 |
|
caishi
|
eece11ba23
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 19:51:41 +08:00 |
|
caishi
|
a249e74526
|
字体颜色
|
2017-09-22 19:51:03 +08:00 |
|
daiao
|
236da38444
|
版本库加遮罩层
|
2017-09-22 19:41:42 +08:00 |
|
XuCheng642
|
ad330e85d0
|
Merge branch 'develop' into dev_xucheng
|
2017-09-22 19:35:50 +08:00 |
|
XuCheng642
|
60739117c4
|
课程列表数据库修改
|
2017-09-22 19:34:22 +08:00 |
|
XuCheng642
|
df949981f8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 19:33:20 +08:00 |
|
XuCheng642
|
09d4613593
|
Merge branch 'dev_xucheng' into develop
|
2017-09-22 19:32:48 +08:00 |
|
XuCheng642
|
00eba5cc70
|
单位部门列表创建修改
|
2017-09-22 19:31:07 +08:00 |
|
caishi
|
87dee8cd9d
|
cursor
|
2017-09-22 19:16:22 +08:00 |
|
miss
|
09c0f974c6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 19:09:43 +08:00 |
|
miss
|
85deee6276
|
学员统计无数据板块
|
2017-09-22 19:09:22 +08:00 |
|
huang
|
6e2135c0cf
|
excel导入注释弹框
|
2017-09-22 19:08:00 +08:00 |
|
huang
|
2ac8536575
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 19:05:56 +08:00 |
|
caishi
|
85071cb1ae
|
添加教师、助教
|
2017-09-22 19:05:39 +08:00 |
|
huang
|
759cda61b9
|
实训复制权限及复制的时候没有复制适用课程
|
2017-09-22 19:05:37 +08:00 |
|
daiao
|
72ce9a0d11
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 18:49:39 +08:00 |
|
caishi
|
0c53d51b2b
|
添加学生
|
2017-09-22 18:49:20 +08:00 |
|
XuCheng642
|
e54190aba7
|
Merge branch 'develop' into dev_xucheng
|
2017-09-22 18:49:18 +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 |
|
daiao
|
9b42441e50
|
实训评论删除，无法局部刷新
|
2017-09-22 18:47:05 +08:00 |
|
XuCheng642
|
1e46eed639
|
Merge branch 'dev_xucheng' into develop
|
2017-09-22 18:42:48 +08:00 |
|
XuCheng642
|
5cd22581ba
|
管理员界面修改
|
2017-09-22 18:40:22 +08:00 |
|
daiao
|
ced586aca9
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 17:29:55 +08:00 |
|
caishi
|
87285f5b45
|
Merge branch 'develop' into dev_cs
|
2017-09-22 17:29:36 +08:00 |
|
daiao
|
8e9b719b0f
|
实训的每一关要增加开始玩、玩的入口
|
2017-09-22 17:29:25 +08:00 |
|
miss
|
328ad9546a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 17:21:05 +08:00 |
 cxt
|
21b1fc32d9
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/student_work/show.html.erb
|
2017-09-22 17:20:25 +08:00 |
|
miss
|
e3b64c1e26
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# public/stylesheets/css/ketang.css
# public/stylesheets/css/taskstyle.css
|
2017-09-22 17:17:51 +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 |
|
cxt
|
758d1bf39d
|
作品匿评的调整
|
2017-09-22 17:04:40 +08:00 |
|
miss
|
71656f27c3
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/views/games/_shixun_comment_block.html.erb
|
2017-09-22 16:43:07 +08:00 |
|
miss
|
41ec6a4838
|
在线课堂缩小后内容显示换行了，tpm设置板块样式问题
|
2017-09-22 16:40:58 +08:00 |
|
caishi
|
6299969267
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-09-22 16:31:56 +08:00 |
|
caishi
|
679b5a559d
|
增加多个选择题tab样式问题
|
2017-09-22 16:31:22 +08:00 |
|
daiao
|
d9b35e1f5c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 15:47:59 +08:00 |
|
daiao
|
46820b959e
|
实训查看答案后通关，跳到下一关时全部任务栏显示有误
|
2017-09-22 15:47:42 +08:00 |
|
cxt
|
d35776c925
|
在线课堂的教师或者助教待审批提醒请增加，另外样式更换
|
2017-09-22 15:39:22 +08:00 |