 daiao
|
112f350995
|
帖子回复功能
|
2017-09-30 21:34:57 +08:00 |
|
daiao
|
e00bb90c23
|
Merge branch 'develop' into dev_daiao
Conflicts:
app/views/games/_shixun_comment_list.html.erb
app/views/layouts/_logined_header.html.erb
|
2017-09-30 19:51:30 +08:00 |
|
daiao
|
7dcc150a25
|
贴吧缺陷修复
|
2017-09-30 19:49:53 +08:00 |
 caishi
|
1cdecbb312
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 19:42:39 +08:00 |
|
caishi
|
274095eed2
|
合作者
|
2017-09-30 19:41:06 +08:00 |
|
daiao
|
cb13f6d360
|
Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao
|
2017-09-30 19:24:20 +08:00 |
|
daiao
|
a5289610a3
|
实训TPI的回复
|
2017-09-30 19:23:38 +08:00 |
 cxt
|
f9a8519cc1
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 18:41:14 +08:00 |
|
cxt
|
4d4251ecfc
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 18:40:18 +08:00 |
 huang
|
ff62264235
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 18:40:12 +08:00 |
|
huang
|
1f51fa5a82
|
代码同步更新的一些修改
|
2017-09-30 18:39:51 +08:00 |
|
caishi
|
c0f1c278d7
|
Merge branch 'dev_cs' into develop
|
2017-09-30 18:39:27 +08:00 |
|
caishi
|
25a39ed828
|
试卷
|
2017-09-30 18:38:26 +08:00 |
|
cxt
|
78aded0451
|
空白块
|
2017-09-30 18:38:19 +08:00 |
|
cxt
|
f85f9fe6a3
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 18:35:17 +08:00 |
|
cxt
|
216a102f0a
|
评阅时刷新评阅情况
|
2017-09-30 18:34:21 +08:00 |
|
caishi
|
c7ac2bdb41
|
Merge branch 'dev_cxt' into dev_cs
Conflicts:
app/views/messages/_course_show.html.erb
app/views/student_work/index.html.erb
|
2017-09-30 18:27:00 +08:00 |
|
caishi
|
18b01609cc
|
保存多选题
|
2017-09-30 18:23:35 +08:00 |
|
cxt
|
b17305f848
|
bug修复
|
2017-09-30 17:38:17 +08:00 |
|
cxt
|
d0010977dd
|
Merge branch 'dev_cs' into develop
|
2017-09-30 16:54:50 +08:00 |
|
cxt
|
af3ca949dc
|
删除班级只能是班级管理员才可以，教师成员中其他教师或助教不应该有此操作
|
2017-09-30 16:53:06 +08:00 |
|
cxt
|
ab8a8bfebc
|
发布实训作业时，点击确认按钮后弹框没有消失导致可以点击无数次，生成多条一样的数据
|
2017-09-30 16:49:24 +08:00 |
|
huang
|
2ee93c73f6
|
Merge branch 'dev_new_gitlab_huang' into develop
|
2017-09-30 16:48:40 +08:00 |
|
huang
|
ddbad8ea77
|
代码更新权限
|
2017-09-30 16:47:01 +08:00 |
|
caishi
|
5ee2755dd2
|
新建试卷入口
|
2017-09-30 16:45:49 +08:00 |
|
huang
|
5952f529b8
|
Merge branch 'dev_new_gitlab_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_new_gitlab_huang
|
2017-09-30 16:43:44 +08:00 |
|
huang
|
cbf70d83cb
|
允许实训成员编辑实训
|
2017-09-30 16:43:12 +08:00 |
|
huang
|
90ade97d88
|
开启挑战的时候将educoder加入到myshixun中
|
2017-09-30 16:38:38 +08:00 |
|
cxt
|
0a5b79739a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 16:34:31 +08:00 |
|
huang
|
5032b368f5
|
数据迁移及发布实训的时候不同步gitlab角色
|
2017-09-30 16:33:59 +08:00 |
|
cxt
|
91ba070ca8
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/messages/_course_show.html.erb
app/views/student_work/index.html.erb
public/stylesheets/css/taskstyle.css
|
2017-09-30 16:33:07 +08:00 |
|
cxt
|
05f4fff34f
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
|
2017-09-30 16:31:18 +08:00 |
|
cxt
|
d38a301ca8
|
已发布的实训路径增加“撤销发布”功能
|
2017-09-30 16:30:49 +08:00 |
|
caishi
|
7771a83ea9
|
删除选项
|
2017-09-30 16:30:43 +08:00 |
 miss
|
5afcbb72c6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/controllers/shixuns_controller.rb
# public/stylesheets/css/edu-public.css
|
2017-09-30 16:18:36 +08:00 |
|
miss
|
48cbae56a3
|
fork按钮的位置问题
|
2017-09-30 16:13:45 +08:00 |
|
miss
|
cde511e613
|
更新代码的刷新效果的显示
|
2017-09-30 16:10:55 +08:00 |
|
cxt
|
1b5b77b6c5
|
测验的编辑
|
2017-09-30 16:10:07 +08:00 |
|
caishi
|
d29ffa7f47
|
TPI中的全部任务，技能标签 +０ 更换成“无”
|
2017-09-30 15:35:23 +08:00 |
|
huang
|
8855b87aef
|
更新提示添加判断
|
2017-09-30 15:34:52 +08:00 |
|
huang
|
b1e1ffcf80
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 15:33:48 +08:00 |
|
huang
|
44c4f4a3a9
|
Merge branch 'dev_new_gitlab_huang' into develop
|
2017-09-30 15:33:34 +08:00 |
|
huang
|
7904f693f0
|
更新代码效果
|
2017-09-30 15:29:46 +08:00 |
|
caishi
|
342204cb69
|
Merge branch 'develop' into dev_cs
|
2017-09-30 15:07:59 +08:00 |
|
caishi
|
5734398b38
|
去掉讨论-帖子列表里面的帖子总数
|
2017-09-30 15:07:33 +08:00 |
|
caishi
|
cb16a1b4b7
|
Merge branch 'dev_new_gitlab_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_new_gitlab_huang
Conflicts:
app/controllers/games_controller.rb
|
2017-09-30 14:57:03 +08:00 |
|
caishi
|
f8320101a5
|
TPI遮罩层
|
2017-09-30 14:53:58 +08:00 |
|
cxt
|
3b25304329
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
app/views/exercise/student_exercise_list.html.erb
|
2017-09-30 14:38:16 +08:00 |
|
cxt
|
799d97d640
|
老师评阅
|
2017-09-30 14:36:17 +08:00 |
|
huang
|
018e24d26e
|
克隆完成后删除代码
|
2017-09-30 14:33:01 +08:00 |