Commit Graph

22257 Commits

Author SHA1 Message Date
caishi ee65fd18fb 选择题任务通过后,遮罩弹框信息修改 2017-09-20 17:16:11 +08:00
caishi da6d67eb35 动态资源列表、讨论列表调整 2017-09-20 14:27:13 +08:00
caishi 2cc520ec17 Merge branch 'develop' into dev_cs 2017-09-20 09:12:42 +08:00
caishi fde0c2dc91 Merge branch 'develop' into dev_cs 2017-09-20 09:11:54 +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 0b50a550b4 Merge branch 'dev_cs' into develop 2017-09-19 17:19:26 +08:00
caishi cad8f38bd5 选项换行 2017-09-19 17:19:00 +08:00
caishi 22a3835e84 Merge branch 'develop' into dev_cs 2017-09-19 17:18:20 +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 5ecb202e14 学生身份点击作品参考答案tab,编辑按钮没有隐藏 2017-09-19 10:43:20 +08:00
cxt a295fe1990 学生试用申请的自动激活 2017-09-19 10:38:54 +08:00
caishi ba67ef8a3a 问吧去掉类别 2017-09-19 09:26:14 +08:00
caishi 3eb85ee6f9 问吧 2017-09-19 09:12:47 +08:00
daiao a5d986779a 修改选择题题干类型(从string类型,修改为text) 2017-09-18 17:27:49 +08:00
daiao 92f4506504 全部实训检索为空时,点击点击叉叉,也会刷新页面 2017-09-18 17:11:16 +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 eeefb8e51e 在实训配置页面点击模拟实战后跳转的页面显示不存在 2017-09-18 14:43:00 +08:00
daiao 71d2c18442 修改实训技术平台后,需要重新生成TPM脚本 2017-09-18 14:21:29 +08:00
daiao bad9e0b5e1 gem报本地不报错 2017-09-18 10:21:15 +08:00
daiao 63aed6be25 C语言评测实际输出与中间层统一 2017-09-18 10:12:50 +08:00
huang 6439ae39e4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-18 10:01:06 +08:00
huang 430f8c6f80 gem 2017-09-18 10:00:36 +08:00
daiao 09b3e5dc46 测试集特殊字符匹配 2017-09-18 08:44:08 +08:00
daiao a44a8cf69a TPI评论数字为0不显示 2017-09-17 17:30:23 +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
miss 19801dc7f4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 15:13:08 +08:00
miss 5ee33d6f8e 前端测试集的显示语提示语 2017-09-17 15:12:38 +08:00
caishi 158236dd69 Merge branch 'develop' into dev_cs 2017-09-17 14:36:04 +08:00
caishi c5f4e729d9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 14:35:15 +08:00
caishi 9672076697 Merge branch 'dev_cs' into develop 2017-09-17 14:34:15 +08:00
caishi 349e2bed09 帖子详情回复 2017-09-17 14:33:45 +08:00
daiao dcc8fed7ec Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 11:25:11 +08:00
daiao 055a254811 测试集样式修改 2017-09-17 11:24: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