Commit Graph

64 Commits

Author SHA1 Message Date
daiao cbcd63f4c3 实训tpm经验值随难易度的改动而改变 2017-04-14 10:27:19 +08:00
daiao 5f67392bfa Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-14 08:41:14 +08:00
daiao fe15d8fa9f TPm纠错 2017-04-14 08:41:00 +08:00
huang 698d9f54d5 TPM纠错 2017-04-14 08:39:09 +08:00
daiao ed9e4f571a 实训纠错弹框 2017-04-13 16:29:15 +08:00
daiao 62619017d6 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
	app/views/games/_game_show.html.erb
2017-04-13 14:34:04 +08:00
daiao d698dd5fc7 纠错(未完成) 2017-04-13 14:33:09 +08:00
huang b147952e94 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-13 14:29:54 +08:00
huang c0f0c8b694 局部刷新 2017-04-13 14:29:33 +08:00
daiao a3031693d9 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
	app/views/games/_repository.html.erb
2017-04-13 14:04:16 +08:00
daiao cf90d84354 实训TPM样式调整 2017-04-13 14:02:29 +08:00
daiao 54ff35bb14 TPI版本库样式调整 2017-04-13 13:46:30 +08:00
huang 06c6817778 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-13 13:45:31 +08:00
huang a7dbc3e822 版本库局部刷新;测评提交结果展示;隐藏展示 2017-04-13 13:45:11 +08:00
daiao fc546e4fd2 实训TPM样式调整 2017-04-13 10:58:34 +08:00
huang 1aa86067ee tpi show页面局部刷新 2017-04-13 10:02:53 +08:00
daiao d2878283d5 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-13 08:48:00 +08:00
daiao eff493187a TPM发布实训弹框 2017-04-13 08:47:36 +08:00
guange 5c0bb0f870 markdown图片上传 2017-04-12 21:55:33 +08:00
huang ec9913ca45 Merge branch 'dev_linda' into dev_huang
Conflicts:
	app/views/layouts/base_shixun.html.erb
	public/stylesheets/css/bigdata-common.css
2017-04-12 17:29:14 +08:00
huang 81588be565 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-12 17:26:08 +08:00
huang 1f412f8dab TPM样式引入调整 2017-04-12 17:25:47 +08:00
daiao 472c6a6bc7 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-12 16:29:44 +08:00
daiao 00036a40d2 实训tpi 2017-04-12 16:29:25 +08:00
huang 1511bc4bed Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-12 16:06:24 +08:00
huang 81be008780 发布实训功能及异常处理、权限处理 2017-04-12 16:06:03 +08:00
daiao 311c69b747 参考答案使用codemirror 2017-04-12 15:25:21 +08:00
daiao f521612b7d tpi使用editorMD展示 2017-04-12 15:10:25 +08:00
Linda b988ac76ef TPM新增样式修改 2017-04-12 15:09:05 +08:00
daiao 057e59acf3 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-12 14:39:22 +08:00
daiao 730953d7f6 TPI的放大与缩小 2017-04-12 14:38:59 +08:00
huang 927898ebda shixun配置中去掉添加脚本功能 2017-04-12 14:03:20 +08:00
huang 4815544223 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-12 13:36:42 +08:00
huang 55972fdbe6 新建实训 --事务一致性及异常处理 2017-04-12 13:36:13 +08:00
daiao d82d90ffbe Codemirror引入主题 2017-04-12 11:04:56 +08:00
huang b2a74c7d5d Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-12 10:35:42 +08:00
huang ba0f5976f0 challenge保存的时候向jenkins发送请求,生成pipeline片段 2017-04-12 10:35:22 +08:00
Linda 68d70df2c0 Merge branch 'dev_huang' into dev_linda
Conflicts:
	app/views/challenges/_form.html.erb
2017-04-12 10:17:40 +08:00
Linda 5671b77e20 新建阶段样式修改 2017-04-12 10:16:23 +08:00
daiao c67cc64751 TPI 2017-04-12 09:38:13 +08:00
daiao fd47c60aa4 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdate into dev_huang
Conflicts:
	app/views/layouts/base_myshixun.html.erb
2017-04-11 17:35:31 +08:00
daiao 4eb4ef442d 实训TPI弹框 2017-04-11 17:34:04 +08:00
huang bd2cbd6793 myshixun新版框架搭建 2017-04-11 17:32:44 +08:00
huang 59a74e5321 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdate into dev_huang 2017-04-11 16:39:33 +08:00
daiao 43d11c5388 tpi改版 2017-04-11 16:38:17 +08:00
huang 68420b8b23 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdate into dev_huang 2017-04-11 14:06:15 +08:00
huang 0be0467cb7 challenge新加字段后新建、编辑功能相应修改 2017-04-11 14:05:50 +08:00
daiao adbb3c24c3 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdate into dev_huang 2017-04-11 13:53:27 +08:00
daiao ca2e7a9c6c 实训TPM过关任务使用MD 2017-04-11 13:53:01 +08:00
huang 7a59b013a0 实训开启接口修改,显示权限控制 2017-04-11 11:09:06 +08:00