Commit Graph

5707 Commits

Author SHA1 Message Date
huang 28f9915d41 下一关权限判断 2017-03-24 10:03:10 +08:00
huang a4bee495a2 下一关的一些改进 2017-03-24 10:00:06 +08:00
huang c4ffa20461 权限控制,及修改获取当前任务的方法 2017-03-24 09:45:01 +08:00
huang a4eec42b7f 已通过控制 2017-03-23 20:23:31 +08:00
huang 62ab862516 tpm权限控制
及index一些统计
2017-03-23 17:41:32 +08:00
huang 77ba9c1958 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-23 15:08:34 +08:00
huang 00b3a7c4fb ajax获取数据 2017-03-23 15:07:23 +08:00
daiao a80eeeb5ab 实训任务 2017-03-23 10:56:00 +08:00
huang c8c3b6188c games一些修改 2017-03-22 18:13:50 +08:00
huang aebdd278a5 下一关修复 2017-03-22 16:21:57 +08:00
huang 5a8f4be6e5 新建及编辑改进 2017-03-22 15:48:06 +08:00
huang 71f6bbf2c4 destroy 2017-03-22 15:11:11 +08:00
huang 3850f21077 编辑功能 2017-03-22 14:57:45 +08:00
huang 0a8f1936f7 challenge编辑 2017-03-22 14:23:44 +08:00
huang ebc7ee4ee5 回调返回success 2017-03-22 13:51:01 +08:00
huang 4d23032937 实训详情 2017-03-22 13:45:01 +08:00
huang 9f0128a878 shixun新建和编辑同步 2017-03-22 10:30:20 +08:00
huang deb6cf4bee run 调试 2017-03-21 20:32:16 +08:00
huang 631acd2d79 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-21 20:07:45 +08:00
huang 76a630c6be 公共方法的封装 2017-03-21 20:06:39 +08:00
daiao da131b7a0a 实训任务 2017-03-21 20:00:29 +08:00
huang d68569d3ab 局部刷新的一些问题 2017-03-21 17:53:35 +08:00
huang 5a1284e42d ajax获取结果 2017-03-21 17:06:17 +08:00
huang e95c686ea1 实训编辑功能完善 2017-03-21 15:02:36 +08:00
huang 62ba2e723c 版本库样式调整 2017-03-21 10:06:06 +08:00
huang 7044ce8f1a 编辑的时候去掉行头字符 2017-03-21 09:03:19 +08:00
huang 56da0352b1 版本库添加编辑功能 2017-03-21 08:56:00 +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 d3d3dc0c5c 实训任务(光哥) 2017-03-19 17:47:14 +08:00
huang a5d6ca7cad ajax相关路由 2017-03-19 14:44:58 +08:00
huang 662d90b431 ajax轮询 2017-03-19 14:34:20 +08:00
huang e34b8ad4ab test 2017-03-19 14:09:16 +08:00
huang 51098f3482 新增参数output input 2017-03-19 12:50:50 +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
huang d021dbb522 编辑 上移 下移动功能 2017-03-16 17:32:20 +08:00
huang 59608d5f1d challenge创建 2017-03-16 16:59:53 +08:00
huang 45911e770e 定义当前任务 2017-03-16 14:20:41 +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 df1b1484f8 新建相关关联 2017-03-14 17:10:32 +08:00
huang 5992bcc128 版本库文件局部刷新 2017-03-14 14:56:08 +08:00
huang 6ec7769c0e Merge branch 'dev_bigdata' into dev_shixun_project
Conflicts:
	app/controllers/account_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_logined_header.html.erb
	app/views/layouts/base_contest_community.html.erb
	app/views/layouts/base_contests.html.erb
	app/views/layouts/base_course_community.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_project_community.html.erb
	app/views/layouts/base_syllabus.html.erb
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/layouts/new_base_user_show.html.erb
	public/stylesheets/css/structure.css
2017-03-14 09:30:02 +08:00
huang 63881869f6 game局部显示版本库路由及相关action 2017-03-13 17:39:27 +08:00
huang 90efe7cc35 tpm版本库目录功能 2017-03-13 14:55:18 +08:00
huang 47e87b115a flash闪存处理 2017-03-13 14:37:39 +08:00