Commit Graph

37 Commits

Author SHA1 Message Date
daiao c77fe5f2dd Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-21 09:17:56 +08:00
daiao bc0c995a0c 实训tpi 2017-03-21 09:17:35 +08:00
huang 37679021ea Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
	app/views/games/_exec_results.html.erb
2017-03-21 08:57:02 +08:00
huang 56da0352b1 版本库添加编辑功能 2017-03-21 08:56:00 +08:00
daiao 6f4e4bea4c 实训tpi放大缩小效果 2017-03-20 20:04:50 +08:00
daiao 1d22b7e2b9 实训界面扩大缩小功能 2017-03-20 17:14:05 +08:00
daiao 5e7dd60194 控制tpi的当前任务 2017-03-20 15:50:04 +08:00
daiao 8708fa4afc 实训任务 2017-03-20 15:41:56 +08:00
daiao b1b1cddd95 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-20 14:35:56 +08:00
daiao 69e116806e 实训任务 2017-03-20 14:35:40 +08:00
huang 072c9550fc Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
	app/controllers/games_controller.rb
2017-03-20 11:26:28 +08:00
huang 563febc7c4 完成上线关 2017-03-20 11:25:15 +08:00
daiao 8d55cb13c7 实训 2017-03-20 10:51:00 +08:00
daiao d3d3dc0c5c 实训任务(光哥) 2017-03-19 17:47:14 +08:00
huang a5d6ca7cad ajax相关路由 2017-03-19 14:44:58 +08:00
huang 4e6a534371 下一关功能 2017-03-17 17:47:04 +08:00
huang 57f74bb56c 自动化构建game 2017-03-17 17:16:10 +08:00
huang 0263165c2b game中任务任务自动功能
ajax局部实现show and index
2017-03-17 12:42:58 +08:00
daiao 40d101119e 实训全部任务页面 2017-03-16 17:30:52 +08:00
daiao 4d0ae4cc22 实训tpi提示 2017-03-16 16:01:37 +08:00
daiao 110b143de0 实训tpi暂离离开 2017-03-16 15:56:50 +08:00
daiao e12ce9f090 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
	app/views/games/show.html.erb
	app/views/layouts/base_myshixun.html.erb
2017-03-16 14:49:50 +08:00
daiao a83f8351b2 实训tpi页面调整 2017-03-16 14:46:11 +08:00
huang a6d8f6834a top公共部分封装 2017-03-16 14:44:57 +08:00
huang 81c135c9dd 测试结果 2017-03-16 11:22:48 +08:00
huang 61db8041a4 输出结果关联 2017-03-16 10:26:02 +08:00
huang 28cf382576 output局部刷新
权限显示控制
2017-03-15 17:57:10 +08:00
huang c7cf576aae games下一关方法封装,部分模块封装 2017-03-15 17:15:41 +08:00
huang 19456503da next方法封装 2017-03-14 18:11:26 +08:00
huang 5992bcc128 版本库文件局部刷新 2017-03-14 14:56:08 +08:00
huang f086f5acd3 版本库封装 2017-03-14 14:38:14 +08:00
huang 38ff90a8bf myshixun模板 2017-03-14 11:25:01 +08:00
huang e3285eecc9 output 输出 2017-03-14 10:48:46 +08:00
huang c069279105 myshixuns 版本库entry 2017-03-14 10:08:49 +08:00
huang 63881869f6 game局部显示版本库路由及相关action 2017-03-13 17:39:27 +08:00
huang fbc52a7892 games模块相关功能 2017-03-13 09:00:13 +08:00
huang 6183db782a games模块开发 2017-03-10 15:41:44 +08:00