 caishi
|
f7ee05076b
|
Merge branch 'dev_daiao' into dev_cs
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2017-07-24 14:53:43 +08:00 |
 daiao
|
0892eb1472
|
个人主页调整
|
2017-07-24 14:49:37 +08:00 |
|
caishi
|
3410002b10
|
Merge branch 'dev_huang' into dev_cs
|
2017-07-24 10:53:36 +08:00 |
 cxt
|
9a3fca4507
|
添加学生报500
|
2017-07-21 21:31:32 +08:00 |
|
cxt
|
293997b2da
|
班级添加学生
|
2017-07-21 20:00:12 +08:00 |
 huang
|
b4ff730229
|
创建答题选项
|
2017-07-21 14:21:10 +08:00 |
|
huang
|
52d27f1167
|
单选多选题编辑
|
2017-07-21 11:09:17 +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 |
|
daiao
|
c1933b5608
|
项目实训的阶段内容划分5个tab进行编辑
|
2017-07-20 16:25:44 +08:00 |
|
cxt
|
24a3fdc453
|
个人资料的真实姓名增加“隐藏真实姓名”选项
|
2017-07-20 11:14:46 +08:00 |
|
cxt
|
b86b465a76
|
TPI的问题反馈更新为“评论”，直接在TPI中显示评论tab
|
2017-07-19 17:26:22 +08:00 |
|
cxt
|
022f4526b8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-18 14:52:54 +08:00 |
|
cxt
|
816e6d605e
|
基本资料增加“昵称”，个人主页显示“昵称”
|
2017-07-18 14:47:50 +08:00 |
|
cxt
|
9f1ee5e5da
|
first_level_discipline_id
|
2017-07-18 09:31:56 +08:00 |
|
daiao
|
c06fb46f25
|
我已经通过第2关未开启第3关，退出实训后继续实战进入的还是第1关，应该是当前任务第2关吧
|
2017-07-18 09:11:52 +08:00 |
|
cxt
|
c25255dfd6
|
删除实训时关联删除课程实训
|
2017-07-17 10:51:37 +08:00 |
|
daiao
|
99ff8e401a
|
管理员实训页面列表搜索后SSH不能使用问题
|
2017-07-17 10:15:51 +08:00 |
|
daiao
|
94aaf39e55
|
用户认证
|
2017-07-14 16:50:24 +08:00 |
|
daiao
|
3e4f551283
|
Merge branch 'dev_daiao' into develop
|
2017-07-14 15:04:25 +08:00 |
|
cxt
|
7242bc73be
|
课程实训首页
|
2017-07-14 12:37:20 +08:00 |
|
cxt
|
5535bfc62e
|
课程实训的新建编辑
|
2017-07-14 09:58:20 +08:00 |
|
daiao
|
ca7d812266
|
Merge branch 'develop' into dev_daiao
|
2017-07-13 15:26:47 +08:00 |
|
daiao
|
49277f39a1
|
超级管理员的实训菜单“已关闭实训
|
2017-07-13 09:48:17 +08:00 |
|
cxt
|
0ebf73860e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/layouts/_unlogin_header.html.erb
|
2017-07-13 09:22:26 +08:00 |
|
cxt
|
65a2355730
|
课程实训
|
2017-07-13 09:20:25 +08:00 |
|
daiao
|
b1ec3e9aac
|
首页实训的单个模块需要加上经验值的icon
|
2017-07-13 08:54:34 +08:00 |
|
huang
|
9ef47950f2
|
实训删除的时候关联删除myshixun
|
2017-07-12 14:07:48 +08:00 |
|
cxt
|
e6a3d8d455
|
课程实训
|
2017-07-11 17:16:28 +08:00 |
|
cxt
|
55e4ac5381
|
消息机制现在走的是留言，请在头像下拉菜单的留言右侧增加显示新消息的提示
|
2017-07-11 14:42:18 +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
|
1f85875f9d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/courses/index.html.erb
|
2017-07-07 18:23:20 +08:00 |
|
cxt
|
5ba8c73f1b
|
实训首页的搜索
|
2017-07-07 16:17:45 +08:00 |
|
cxt
|
7b9c59d6e8
|
基础数据加上“专业”、“课程”，实训的适用专业和课程
|
2017-07-06 17:52:59 +08:00 |
|
huang
|
cd67988902
|
tpi添加连接webssh及断开webssh接口
|
2017-07-06 11:32:13 +08:00 |
|
huang
|
37556a7933
|
webssh类型的实训开启的时候添加webssh实训
|
2017-07-06 10:48:30 +08:00 |
|
huang
|
0b2bdc526a
|
webssh.rb端口记录
|
2017-07-06 09:46:54 +08:00 |
|
cxt
|
cebd0c6c77
|
新建班级中的学分保留一位小数
|
2017-07-04 16:26:18 +08:00 |
|
cxt
|
95ac6771c1
|
绑定邮箱的邮件发送失败
|
2017-07-03 15:46:54 +08:00 |
|
huang
|
08fd149868
|
实训开启不成功问题
|
2017-06-30 23:54:26 +08:00 |
|
huang
|
b18f0dd772
|
当前关卡方法修改；耗时修改
|
2017-06-30 20:08:19 +08:00 |
|
huang
|
414c0870ce
|
实训审批排序
|
2017-06-30 15:35:30 +08:00 |
|
cxt
|
9cf218300c
|
为了避免数据对不上，在作业结束后加入班级的学员应该在已结束的作品列表中加入空白数据
|
2017-06-30 09:44:39 +08:00 |
|
cxt
|
3b302de197
|
匿评的时候头部定位显示出学院姓名，应该显示为匿名
|
2017-06-29 15:41:52 +08:00 |
|
cxt
|
9bba3752a4
|
实训阶段的难易度显示不正确
|
2017-06-28 16:21:37 +08:00 |
|
cxt
|
f6bd9846ec
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-28 15:23:36 +08:00 |
|
cxt
|
5508cedb45
|
实训作业
|
2017-06-28 15:23:09 +08:00 |
|
huang
|
be17994e7a
|
添加经验值功能
|
2017-06-26 14:05:39 +08:00 |
|
huang
|
b2b4b8cd32
|
删除实训的时候一并删除shixun_modify记录
|
2017-06-23 16:14:20 +08:00 |
|
huang
|
a99361e89a
|
开始实训的时候记录默认代开文件初始代码
|
2017-06-23 10:20:34 +08:00 |
|
huang
|
5022ddaf65
|
实训参数修改
|
2017-06-22 21:35:24 +08:00 |