 cxt
|
f82b8f0e20
|
班级讨论区的上线
|
2017-07-28 16:59:17 +08:00 |
|
cxt
|
26f68e019b
|
实训套件首页显示的数据应该包括只创建了套件但是没有添加阶段的数据
|
2017-07-24 14:58:27 +08:00 |
 daiao
|
1da8405726
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-21 15:26:28 +08:00 |
|
daiao
|
ac6e9a755c
|
项目实训首页的筛选条件新增“所有状态”
|
2017-07-21 15:24:22 +08:00 |
 caishi
|
eb58421cd1
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/users/show.html.erb
public/stylesheets/css/edu-common.css
public/stylesheets/css/edu-public.css
|
2017-07-21 15:21:55 +08:00 |
|
daiao
|
06f73b6c82
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/courses/index.html.erb
app/views/shixuns/_form.html.erb
|
2017-07-21 10:00:45 +08:00 |
 huang
|
b83a333a9d
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/shixuns/index.html.erb
|
2017-07-20 17:19:46 +08:00 |
|
caishi
|
f3fd5a521d
|
班级讨论区页面
|
2017-07-20 15:48:49 +08:00 |
|
cxt
|
482022a58a
|
TPI评论区操作按钮的显隐
|
2017-07-20 09:21:12 +08:00 |
|
cxt
|
b86b465a76
|
TPI的问题反馈更新为“评论”，直接在TPI中显示评论tab
|
2017-07-19 17:26:22 +08:00 |
|
daiao
|
3aa8f4344e
|
在实训配置页面点击继续实战，跳转的页面给出页面已删除
|
2017-07-19 11:59:00 +08:00 |
|
daiao
|
7051b5f912
|
项目实训最热排名应该按人数进行降序排列
|
2017-07-19 10:13:36 +08:00 |
|
cxt
|
c25255dfd6
|
删除实训时关联删除课程实训
|
2017-07-17 10:51:37 +08:00 |
|
cxt
|
7242bc73be
|
课程实训首页
|
2017-07-14 12:37:20 +08:00 |
|
cxt
|
6c527a7239
|
实训首页显示所有状态的实训，但是未发布的显示“编辑中，无法访问”
|
2017-07-13 10:36:09 +08:00 |
|
daiao
|
096b44e350
|
管理员实训列表
|
2017-07-10 16:41:15 +08:00 |
|
cxt
|
3f276b8f31
|
实训合并
|
2017-07-07 18:28:08 +08:00 |
|
cxt
|
4f3bc9a2e4
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/controllers/shixuns_controller.rb
app/helpers/application_helper.rb
|
2017-07-07 18:25:44 +08:00 |
|
cxt
|
5ba8c73f1b
|
实训首页的搜索
|
2017-07-07 16:17:45 +08:00 |
|
huang
|
a75f477797
|
合作者拥有编写实训代码的权限
|
2017-07-07 11:23:15 +08:00 |
|
huang
|
0a65ebb1d0
|
版本库添加在线编辑功能
|
2017-07-07 11:04:53 +08:00 |
|
cxt
|
7b9c59d6e8
|
基础数据加上“专业”、“课程”，实训的适用专业和课程
|
2017-07-06 17:52:59 +08:00 |
|
huang
|
37556a7933
|
webssh类型的实训开启的时候添加webssh实训
|
2017-07-06 10:48:30 +08:00 |
|
huang
|
0ea4410271
|
Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao
|
2017-07-06 09:47:15 +08:00 |
|
huang
|
0b2bdc526a
|
webssh.rb端口记录
|
2017-07-06 09:46:54 +08:00 |
|
daiao
|
f5bcc7dff8
|
在title搜索框中搜索课堂出来的数据会影响全部课堂的数据显示
|
2017-07-06 09:05:20 +08:00 |
|
huang
|
624592281c
|
web ssh
|
2017-07-05 14:16:02 +08:00 |
|
huang
|
40b276e386
|
添加webssh测试调试
|
2017-07-03 17:06:55 +08:00 |
|
huang
|
08fd149868
|
实训开启不成功问题
|
2017-06-30 23:54:26 +08:00 |
|
huang
|
5aaf8363cc
|
添加日志
|
2017-06-30 23:43:31 +08:00 |
|
cxt
|
543923b2ea
|
撤销发布失败
|
2017-06-30 21:00:13 +08:00 |
|
huang
|
c3b40f605b
|
头部搜索增加条件；已关闭去掉鼠标效果
|
2017-06-30 16:50:12 +08:00 |
|
huang
|
bc44cbafe0
|
实训首页经验值修改
|
2017-06-30 16:36:07 +08:00 |
|
huang
|
72c39fab83
|
实训结构修改后首页查询及搜索更新
|
2017-06-30 16:03:15 +08:00 |
|
huang
|
70940aa38b
|
实训开启逻辑不合理处理，改成点击后判断逻辑及弹框
|
2017-06-30 14:04:32 +08:00 |
|
cxt
|
c490420064
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-30 09:26:52 +08:00 |
|
cxt
|
54e014fd20
|
申请发布被拒绝后，新开页面访问TPM报无权限正确；但是非合作团队原来已经打开的页面上“模拟实战”依然可用？
|
2017-06-29 19:57:08 +08:00 |
|
huang
|
f301d6a5bc
|
git地址改成内网地址
|
2017-06-29 15:51:49 +08:00 |
|
huang
|
efc5153059
|
解决发布实训取消实训这个阶段中实训更改状态记录，便于后续判断是否需要重置脚本
|
2017-06-26 18:20:28 +08:00 |
|
cxt
|
457e24f5ca
|
编辑配置时若该实训已申请发布则不能编辑
|
2017-06-23 21:09:44 +08:00 |
|
huang
|
b2b4b8cd32
|
删除实训的时候一并删除shixun_modify记录
|
2017-06-23 16:14:20 +08:00 |
|
cxt
|
a9d556dc60
|
实训重置弹框
|
2017-06-23 15:13:45 +08:00 |
|
cxt
|
3970efa0fd
|
实训重置
|
2017-06-23 14:33:18 +08:00 |
|
daiao
|
e2c15578c4
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/controllers/managements_controller.rb
config/routes.rb
|
2017-06-23 11:20:15 +08:00 |
|
daiao
|
0ed461faf3
|
实训配置默认进入编辑状态，点击保存后应该是查看状态（即区分编辑和查看状态）
|
2017-06-23 10:51:29 +08:00 |
|
cxt
|
48d335ea31
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
app/controllers/games_controller.rb
|
2017-06-23 10:40:35 +08:00 |
|
cxt
|
96165230ad
|
实训流程
|
2017-06-23 10:38:40 +08:00 |
|
huang
|
a99361e89a
|
开始实训的时候记录默认代开文件初始代码
|
2017-06-23 10:20:34 +08:00 |
|
daiao
|
395eb0244c
|
实训预备知识增加编辑功能
|
2017-06-23 08:57:56 +08:00 |
|
cxt
|
2e515b0ddc
|
实训的重置
|
2017-06-22 20:14:05 +08:00 |