 cxt
|
0685feaf68
|
申请发布被超级管理员拒绝时，因系统消息未上，请将拒绝原因以留言的形式发送给整个合作团队的成员
|
2017-06-30 10:17:44 +08:00 |
|
cxt
|
c490420064
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-30 09:26:52 +08:00 |
 huang
|
84ca57c88a
|
修改版本库地址问题
|
2017-06-30 09:25:17 +08:00 |
|
cxt
|
54e014fd20
|
申请发布被拒绝后，新开页面访问TPM报无权限正确；但是非合作团队原来已经打开的页面上“模拟实战”依然可用？
|
2017-06-29 19:57:08 +08:00 |
|
cxt
|
59f0c242bf
|
分组作业列表没有显示全小组成员的信息
|
2017-06-29 19:34:46 +08:00 |
|
cxt
|
31898cbc4f
|
分组作业评阅中没有显示其他组员的名字，label需要替换新样式
|
2017-06-29 18:57:51 +08:00 |
|
huang
|
45099912b4
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-29 15:52:57 +08:00 |
|
huang
|
f301d6a5bc
|
git地址改成内网地址
|
2017-06-29 15:51:49 +08:00 |
|
cxt
|
55ec4c32c8
|
题库新建实训作业的弹框调整、创建实训作业选择实训的导师姓名更改为“创建者”
|
2017-06-29 15:05:14 +08:00 |
|
cxt
|
7188f24d56
|
超级管理员实现发布审批页，点击审批操作后，页面没有刷新列表
|
2017-06-29 10:43:05 +08:00 |
|
cxt
|
0dd677602d
|
超级管理员身份认证，待审批和已审批不能正常切换
|
2017-06-29 09:59:59 +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
|
c4c68b969b
|
解决重置操作版本删除的时候一致性问题
|
2017-06-28 14:24:57 +08:00 |
|
huang
|
03a20183b0
|
解决代码重置局部刷新问题
|
2017-06-27 16:33:42 +08:00 |
|
cxt
|
725697392e
|
自己评阅的历史记录应该可以删除，最新的不可以删除、连续评阅不成功
|
2017-06-27 15:04:34 +08:00 |
|
cxt
|
c7aad72311
|
删除课程的跳转和样式调整
|
2017-06-27 09:22:03 +08:00 |
|
huang
|
efc5153059
|
解决发布实训取消实训这个阶段中实训更改状态记录，便于后续判断是否需要重置脚本
|
2017-06-26 18:20:28 +08:00 |
|
cxt
|
dd4073cfbd
|
超级管理员的实训审批页面显示调整
|
2017-06-26 17:35:55 +08:00 |
|
cxt
|
835ca6cc11
|
编程作业的样式调整
|
2017-06-26 17:08:22 +08:00 |
|
huang
|
89c2fe23d5
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-26 14:06:03 +08:00 |
|
huang
|
be17994e7a
|
添加经验值功能
|
2017-06-26 14:05:39 +08:00 |
|
cxt
|
457e24f5ca
|
编辑配置时若该实训已申请发布则不能编辑
|
2017-06-23 21:09:44 +08:00 |
|
cxt
|
4fdc424f65
|
未正式发布的实训点击参考答案不应该要经验值
|
2017-06-23 20:02:14 +08:00 |
|
cxt
|
a3afd03dd3
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-23 16:45:01 +08:00 |
 daiao
|
4121907f31
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-23 16:28:11 +08:00 |
|
daiao
|
4ecb40e483
|
管理员界面手机用户搜索
|
2017-06-23 16:27:56 +08:00 |
|
cxt
|
621b2023f5
|
隐藏班级动态中未实现的部分
|
2017-06-23 16:24:06 +08:00 |
|
cxt
|
bc1fa9f291
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-23 16:18:39 +08:00 |
|
cxt
|
df2d1e9f0e
|
实训作业相关
|
2017-06-23 16:18:23 +08:00 |
|
huang
|
113dfbdeb4
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-23 16:14:33 +08:00 |
|
huang
|
b2b4b8cd32
|
删除实训的时候一并删除shixun_modify记录
|
2017-06-23 16:14:20 +08:00 |
|
daiao
|
82a5b24e3c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-23 15:59:49 +08:00 |
|
daiao
|
7e54f6f69b
|
缺陷修复
|
2017-06-23 15:59:32 +08:00 |
|
cxt
|
a9d556dc60
|
实训重置弹框
|
2017-06-23 15:13:45 +08:00 |
|
cxt
|
3ec20e57dc
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-23 14:33:43 +08:00 |
|
cxt
|
3970efa0fd
|
实训重置
|
2017-06-23 14:33:18 +08:00 |
|
daiao
|
7d6f381415
|
解决冲突
|
2017-06-23 13:57:25 +08:00 |
|
huang
|
ab752f3665
|
实训重置封装
|
2017-06-23 12:29:51 +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 |
|
huang
|
3bc5d0d2e0
|
解决冲突
|
2017-06-23 10:44:16 +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
|
774a9410bd
|
实训通关后记录最近一次文件内容
|
2017-06-23 10:34:28 +08:00 |
|
huang
|
a99361e89a
|
开始实训的时候记录默认代开文件初始代码
|
2017-06-23 10:20:34 +08:00 |
|
daiao
|
395eb0244c
|
实训预备知识增加编辑功能
|
2017-06-23 08:57:56 +08:00 |
|
huang
|
5022ddaf65
|
实训参数修改
|
2017-06-22 21:35:24 +08:00 |
|
cxt
|
2e515b0ddc
|
实训的重置
|
2017-06-22 20:14:05 +08:00 |
|
huang
|
568a7eb218
|
shixun开启的一些问题
|
2017-06-22 17:37:27 +08:00 |