 cxt
|
0a5b79739a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 16:34:31 +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
|
d38a301ca8
|
已发布的实训路径增加“撤销发布”功能
|
2017-09-30 16:30:49 +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 |
|
cxt
|
1b5b77b6c5
|
测验的编辑
|
2017-09-30 16:10:07 +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
|
7904f693f0
|
更新代码效果
|
2017-09-30 15:29:46 +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
|
799d97d640
|
老师评阅
|
2017-09-30 14:36:17 +08:00 |
|
huang
|
018e24d26e
|
克隆完成后删除代码
|
2017-09-30 14:33:01 +08:00 |
|
huang
|
a7251a950d
|
完成代码同步测试版
|
2017-09-30 11:30:51 +08:00 |
|
miss
|
88b5a20c47
|
分页个数
|
2017-09-30 10:50:12 +08:00 |
|
huang
|
3c19e12081
|
实训版本库代码同步功能
|
2017-09-30 10:42:26 +08:00 |
 XuCheng642
|
fbf3d3f747
|
作业回复链接
|
2017-09-29 21:53:08 +08:00 |
|
miss
|
aa9ab75149
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-29 21:11:25 +08:00 |
|
miss
|
12cebcb252
|
学员统计板块的金币值模块以及其它问题的修改。tip样式的增加与修改
|
2017-09-29 21:10:56 +08:00 |
|
XuCheng642
|
811ea0f324
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/views/managements/_leave_message_list.html.erb
|
2017-09-29 20:18:23 +08:00 |
|
XuCheng642
|
4617e8d803
|
自动授权学校
|
2017-09-29 18:44:40 +08:00 |
|
XuCheng642
|
231fa0dcf7
|
链接
|
2017-09-29 18:38:21 +08:00 |
|
cxt
|
f98f554aaf
|
试卷
|
2017-09-29 18:18:38 +08:00 |
|
XuCheng642
|
d679111b41
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/views/shixuns/_shixun_top.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-29 16:35:44 +08:00 |
|
XuCheng642
|
cbb648dd40
|
自动授权列表
|
2017-09-29 16:18:41 +08:00 |
 daiao
|
60a1e135a8
|
Merge branch 'dev_daiao' into develop
|
2017-09-29 16:03:57 +08:00 |
|
daiao
|
17c145a0f5
|
讨论评论无法局部刷新
|
2017-09-29 16:02:08 +08:00 |
|
cxt
|
e13bb9316f
|
试卷的插入、上下移动、删除等功能
|
2017-09-29 15:55:37 +08:00 |
|
daiao
|
f88832796b
|
讨论按照置顶与非指定排序
|
2017-09-29 11:29:09 +08:00 |
|
daiao
|
b023d5fbaf
|
顶部导航的“论坛”页面
|
2017-09-29 11:13:16 +08:00 |
|
miss
|
dfe5fe828e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-29 11:11:01 +08:00 |
|
cxt
|
37f5b9ff46
|
试卷作品列表
|
2017-09-29 10:20:09 +08:00 |
|
huang
|
d2138f41bd
|
测试集
|
2017-09-28 19:27:27 +08:00 |
|
huang
|
8987c8a5e1
|
修改测试集不能需要重置实训
|
2017-09-28 19:21:58 +08:00 |
|
daiao
|
aa4ec780b7
|
讨论详情页二级回复功能
|
2017-09-28 17:29:36 +08:00 |
|
cxt
|
7aef72d7a3
|
在线试卷
|
2017-09-28 16:51:15 +08:00 |
|
huang
|
e46c4a57e3
|
发布了修改版本也会触发事件
|
2017-09-28 16:20:05 +08:00 |
|
miss
|
3602ecfad2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-28 16:11:02 +08:00 |
|
miss
|
e070769613
|
tip调整
|
2017-09-28 16:10:26 +08:00 |
|
daiao
|
bfd4ee86ec
|
一级回复与点赞功能
|
2017-09-28 15:28:03 +08:00 |
|
huang
|
fad2fb478f
|
实训复制失败添加日志区分
|
2017-09-28 14:12:42 +08:00 |
|
huang
|
3ce5368a9a
|
老师角色
|
2017-09-28 11:29:05 +08:00 |
|
huang
|
fc0673e6d7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-28 11:11:40 +08:00 |
|
huang
|
76cd81ec8e
|
复制权限修改
|
2017-09-28 11:11:15 +08:00 |
|
daiao
|
8a41a9aea1
|
新建、删除选择题需要重置关卡，删除关卡时，给出提示。
|
2017-09-27 10:27:51 +08:00 |
|
daiao
|
82bb30622f
|
删除关卡报500
|
2017-09-27 08:47:48 +08:00 |
|
daiao
|
f07104bdb2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-26 16:14:26 +08:00 |
|
daiao
|
6e27beea08
|
选择题权限控制
|
2017-09-26 16:14:14 +08:00 |
|
cxt
|
bf634b56e1
|
实训统计调整
|
2017-09-26 15:53:17 +08:00 |
|
huang
|
3ec5a7991f
|
已发布的实训如果修改实训的“技术平台”不触发强制重置
|
2017-09-26 15:47:31 +08:00 |
|
cxt
|
0ad0577896
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-26 15:14:17 +08:00 |
|
cxt
|
31f199a3f6
|
实训统计调整
|
2017-09-26 15:13:57 +08:00 |