Commit Graph

1057 Commits

Author SHA1 Message Date
huang 29acff9dde 去掉抛出异常 2017-09-22 10:58:15 +08:00
huang a234bdc01b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 10:47:41 +08:00
huang 3df0b71d0f 复制的时候添加错误提醒 2017-09-22 10:09:34 +08:00
huang 8457e4d784 完成实训的复制功能 2017-09-22 09:52:13 +08:00
daiao 71b8667f0a 选择题新建报500 2017-09-21 17:56:53 +08:00
huang 84643fe2cb 实训复制添加可配置功能 2017-09-21 17:25:51 +08:00
cxt df5b70a558 继续实战报500 2017-09-21 17:07:21 +08:00
huang 945a3772e6 实训复制完善 2017-09-21 16:50:13 +08:00
cxt b2c284360f Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-21 15:53:26 +08:00
cxt 0b38eca942 实训作业的完成情况实时更新 2017-09-21 15:50:08 +08:00
huang f88bc764bb 实训关卡、测试集、tag复制 2017-09-21 15:20:39 +08:00
daiao 4d6b0f5cda 全部任务中金币数值和评测中的金币数值需保持一致 2017-09-21 10:37:35 +08:00
daiao 7f2b482bfd 查看参考答案扣分有误 2017-09-21 09:12:53 +08:00
daiao 833be4dbaa 训路径的简介、学习须知,请改为 ke 编辑器 2017-09-20 11:16:26 +08:00
daiao e86720be6b 全部实训最新的排序不正确 2017-09-20 10:19:41 +08:00
daiao d1cf530237 实训首页的全部显示的数据和检索的数据不一致,全部显示的数据不算隐藏的 2017-09-20 10:00:47 +08:00
huang ea29e79365 Merge branch 'develop' into dev_huang 2017-09-19 17:29:32 +08:00
huang fcf78d07dd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-19 17:25:15 +08:00
huang 66ef740235 复制注释 2017-09-19 17:25:03 +08:00
caishi a09450a805 Merge branch 'dev_cs' into develop
Conflicts:
	app/views/games/_choice_question.html.erb
2017-09-19 17:17:40 +08:00
caishi df60c289ad 选择题选项换行、开始实战的加载层 2017-09-19 17:15:50 +08:00
huang 7c802ba4b8 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-19 14:26:45 +08:00
huang 8cd9ff0a53 修复实训选题相关问题 2017-09-19 14:26:29 +08:00
cxt 1f5db1eb1d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-19 10:46:41 +08:00
cxt a295fe1990 学生试用申请的自动激活 2017-09-19 10:38:54 +08:00
daiao 3aea522dee Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-18 16:21:39 +08:00
daiao cd6d56059f 提供超级管理员的检索导出功能 2017-09-18 16:21:27 +08:00
huang 3412a69c3b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	Gemfile
2017-09-18 15:26:18 +08:00
huang fcaa798620 注释掉提交代码hook触发事件 2017-09-18 15:25:34 +08:00
cxt cb9e28f907 提示文字的修改 2017-09-18 15:16:03 +08:00
cxt 66da4b1676 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-18 14:49:41 +08:00
cxt f3c85b300c 同意或拒绝教师加入班级,页面会跳转到班级设置页面 2017-09-18 14:48:24 +08:00
daiao 9161d4c065 课程导出excel 2017-09-18 14:46:18 +08:00
daiao 71d2c18442 修改实训技术平台后,需要重新生成TPM脚本 2017-09-18 14:21:29 +08:00
huang 1ec289c197 Merge branch 'develop' into dev_huang 2017-09-18 10:32:02 +08:00
daiao 7454ce85b7 实训测试集 2017-09-17 16:43:36 +08:00
daiao 752210f0fc 实际输出 2017-09-17 16:31:17 +08:00
daiao 068cb7b492 测试集匹配 2017-09-17 16:22:04 +08:00
daiao 41fa772329 TPI测试集 2017-09-17 16:12:57 +08:00
XuCheng642 a4480cf2ce Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 11:20:26 +08:00
XuCheng642 4bc4225681 实名认证和职业认证搜索 2017-09-17 11:19:59 +08:00
daiao 738fd2f23e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 09:42:07 +08:00
huang 4e30c42a60 导入结果弹框提醒 2017-09-15 22:59:32 +08:00
cxt a412a42976 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/helpers/courses_helper.rb
2017-09-15 22:53:47 +08:00
daiao 491d92848e 评论需要显示数目 2017-09-15 22:48:42 +08:00
cxt 9b52184106 我的题库页面的搜索,回车无效 2017-09-15 22:44:17 +08:00
huang 87d47fe672 成员管理弹框数据统计 2017-09-15 22:35:40 +08:00
cxt 61f1d9bd10 课堂相关修改 2017-09-15 22:35:36 +08:00
daiao 29715236da 凡是没有权限的,要判断是否已经登陆 2017-09-15 22:30:26 +08:00
cxt cbef08f099 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 21:25:37 +08:00