Commit Graph

188 Commits

Author SHA1 Message Date
daiao ec22bbe0c1 Merge branch 'develop' into dev_daiao
Conflicts:
	app/controllers/games_controller.rb
	app/views/challenges/edit.html.erb
	app/views/games/_game_show.html.erb
	public/stylesheets/css/edu-common.css
2017-09-15 09:10:36 +08:00
daiao 9dc48292eb 单选多选题 2017-09-14 18:45:19 +08:00
daiao 2c7e5d1f38 TPI单选多选题 2017-09-14 17:30:58 +08:00
daiao f79a40ca65 单选多选题 2017-09-13 16:01:18 +08:00
daiao 19c9e52aa4 测试集抛异常则不特殊处理空格 2017-09-08 16:22:51 +08:00
daiao 0bc86d9bd7 实训TPI的评测按钮区域新增“上一关” 2017-09-08 11:21:08 +08:00
daiao bad7322c86 实际输出是异常输出则不匹配空格 2017-09-08 09:18:33 +08:00
daiao 918d6b3c95 实训类型 2017-09-07 20:35:30 +08:00
daiao 79d2aadf93 评测结果分类 2017-09-07 15:03:12 +08:00
daiao c877f40ccd 评测代码错误分类 2017-09-07 14:36:25 +08:00
daiao 0b1f6f5378 实训TPI代码评测修改为代码抛异常和代码实际输出与测试集输出不匹配2种类型 2017-09-07 14:22:12 +08:00
daiao d67edced16 单选多选题 2017-09-07 09:42:12 +08:00
huang bb170d810d 重新评测通关显示问题 2017-09-06 17:53:13 +08:00
huang 2d5b255d52 评测数据显示问题 2017-09-06 16:33:09 +08:00
huang 29ad462f17 解决评测信息有误解及评测结果不明确问题 2017-09-06 16:23:19 +08:00
daiao 2daf1d9c24 评测 2017-09-05 17:38:59 +08:00
huang 8562ab0e2f 解决评测通关数字不明确问题 2017-09-04 10:52:30 +08:00
huang 1506ce19dd 发布状态的一些权限控制 2017-09-01 13:20:36 +08:00
huang e60582787d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/views/games/_code_actions.html.erb
2017-08-31 16:38:07 +08:00
huang 328e7236a9 完成跳关打实训 2017-08-30 17:30:32 +08:00
daiao dde055fd3a 实训TPI提示等待时间信息 2017-08-29 17:07:11 +08:00
huang 771863e009 修改实训post中间层uri转换方式 2017-08-13 10:48:05 +08:00
huang 7a73f13441 实训评测 2017-08-11 22:50:24 +08:00
huang 11088c8eb0 Merge branch 'dev_kubernete' into develop 2017-08-11 22:13:27 +08:00
daiao d1984b226b 金币、经验值的局部刷新 2017-08-11 22:03:25 +08:00
huang 86ba839bd5 Merge branch 'develop' into dev_kubernete 2017-08-11 20:47:26 +08:00
daiao 0a20e01e02 评测后实训最终得分没变 2017-08-11 20:30:14 +08:00
huang 355ffddbd4 Merge branch 'develop' into dev_kubernete 2017-08-11 20:14:37 +08:00
daiao d37bb1c131 实训单选多选题评测报错 2017-08-11 20:10:45 +08:00
huang d92d4e8ee7 Merge branch 'develop' into dev_kubernete
Conflicts:
	.idea/dataSources.xml
	app/controllers/shixuns_controller.rb
2017-08-11 14:52:08 +08:00
huang 62029067e6 url中间层添加encode安全传送 2017-08-10 16:53:32 +08:00
huang f0dcd2a175 game评测的时候异常打印 2017-08-10 16:29:16 +08:00
huang 0246a20ce8 修复game详情base64转换错误 2017-08-10 15:43:04 +08:00
huang f98ed3c238 解决不同Ruby版本Base64解码问题 2017-08-10 14:33:34 +08:00
cxt b7ed446397 金币和经验值的记录迁移 2017-08-10 10:18:28 +08:00
cxt 583eef8086 首页的技能标签 2017-08-09 09:01:22 +08:00
huang bca2b851df 实训评测的时候查询逻辑修改:主要是错误信息查最新的一条 2017-08-08 17:30:05 +08:00
cxt 7af3818338 点赞的计数有bug 2017-08-08 14:58:02 +08:00
huang 75e33ac3a9 评测的一些修改 2017-08-08 11:08:59 +08:00
huang 7f9de6f4ac base64编码改成安全编码 2017-08-06 15:34:24 +08:00
huang 8a6a169434 评测的时候添加gameInfo 2017-08-04 21:34:37 +08:00
huang d1432495ec Merge branch 'develop' into dev_kubernete 2017-08-04 20:42:16 +08:00
daiao ba60f9e694 实训TPI加入点赞与踩的数据统计 2017-08-04 16:10:42 +08:00
daiao 53f5ae6945 选择题实训报错 2017-08-04 14:40:12 +08:00
huang 04c142698f kubernetes新架构下的一些修改 2017-08-04 14:19:22 +08:00
daiao c22de54489 实训未发布只是进行模拟实战,答题正确后选择题不应该有经验值 2017-08-04 13:58:14 +08:00
daiao 397e59e5d1 html实训 2017-08-04 09:38:10 +08:00
daiao 6e1e199079 实训TPM“编程任务”改为“实践任务” 2017-07-31 13:54:10 +08:00
daiao 50877bb2c7 测试 2017-07-28 20:36:02 +08:00
daiao c26f3ed61a 多选题 2017-07-28 20:13:25 +08:00