jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,254 Commits 98 Branches 0 Tags 0 B
Commit Graph

15569 Commits

Author SHA1 Message Date
huang b77ba2b751 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 10:38:45 +08:00
huang f8a05e72d1 为0的时候不显示 2017-03-24 10:38:30 +08:00
daiao 0dd140749c Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 10:28:39 +08:00
daiao 80835ab8dc 实训编辑模式样式调整 2017-03-24 10:28:20 +08:00
huang fdf71d33b3 message存入数据库 2017-03-24 10:22:03 +08:00
huang 2326e25dba 开启实训前的一些提示 2017-03-24 10:15:49 +08:00
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 3482ececf9 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 20:24:41 +08:00
huang a4eec42b7f 已通过控制 2017-03-23 20:23:31 +08:00
daiao b20e265d8d Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 20:22:23 +08:00
daiao 44ec1d23cc TPI实训 2017-03-23 20:21:37 +08:00
daiao 840a57fb0e TPM新建阶段加入KE 2017-03-23 20:19:39 +08:00
huang c3708d723e Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 17:41:48 +08:00
huang 62ab862516 tpm权限控制 
及index一些统计
 2017-03-23 17:41:32 +08:00
daiao ac7959bb21 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 16:51:47 +08:00
daiao e4985ce3bd 实训任务 2017-03-23 16:51:32 +08:00
huang 63494a2487 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 16:36:35 +08:00
huang 8006237d16 修改测试用例类型 2017-03-23 16:35:18 +08:00
daiao 4c50c708c2 实训任务 2017-03-23 15:50:27 +08:00
huang ffe1641485 完成数据结果ajax获取 2017-03-23 15:42:09 +08:00
huang d61e4753cf end问题 2017-03-23 15:10:56 +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 8e93f5758f 实训任务 2017-03-23 14:18:00 +08:00
daiao 56c7dccd56 实训 2017-03-23 14:03:09 +08:00
daiao 9bc860eb24 实训任务 2017-03-23 13:43:56 +08:00
daiao 7888cc1101 实训 2017-03-23 11:09:38 +08:00
daiao a80eeeb5ab 实训任务 2017-03-23 10:56:00 +08:00
daiao 6f00a89cfa 保存修改-宽版 2017-03-23 09:30:19 +08:00
daiao 57a6b4d322 保存修改按钮放上面 2017-03-23 09:04:02 +08:00
huang c8c3b6188c games一些修改 2017-03-22 18:13:50 +08:00
huang 62fe591438 回调修改 2017-03-22 16:30:47 +08:00
huang aebdd278a5 下一关修复 2017-03-22 16:21:57 +08:00
huang ba7e603bb0 课程base样式 2017-03-22 16:01:20 +08:00
huang 9bca636f04 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-22 15:48:21 +08:00
huang 5a8f4be6e5 新建及编辑改进 2017-03-22 15:48:06 +08:00
daiao 6b3d266e57 实训任务 2017-03-22 15:46:19 +08:00
huang ac0f3f7358 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-22 15:11:23 +08:00
huang 71f6bbf2c4 destroy 2017-03-22 15:11:11 +08:00
daiao f8626db263 实训任务 2017-03-22 15:07:14 +08:00
daiao 91975a624c Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-22 14:58:35 +08:00
daiao 38bfa7250e 实训任务 2017-03-22 14:58:27 +08:00
huang a8045f54d3 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-22 14:58:04 +08:00
huang 3850f21077 编辑功能 2017-03-22 14:57:45 +08:00
daiao 5f2a9869f9 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-22 14:24:42 +08:00
daiao 2a90ed3a42 实训任务 2017-03-22 14:24:22 +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 0dbe68e6ee Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-22 13:45:27 +08:00
huang 4d23032937 实训详情 2017-03-22 13:45:01 +08:00
daiao 20bbfe7d4e Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-22 10:53:44 +08:00
daiao 6b20855439 实训任务 2017-03-22 10:53:27 +08:00
huang 9f0128a878 shixun新建和编辑同步 2017-03-22 10:30:20 +08:00
huang 66fc9b858e 路由参数 2017-03-21 20:48:47 +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 e098f7abf6 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-21 17:53:53 +08:00
huang d68569d3ab 局部刷新的一些问题 2017-03-21 17:53:35 +08:00
daiao 97894811a0 实训任务 2017-03-21 17:37:18 +08:00
daiao 905dca7758 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 17:07:26 +08:00
daiao a3f0cc9b51 实训 2017-03-21 17:06:24 +08:00
huang 5a1284e42d ajax获取结果 2017-03-21 17:06:17 +08:00
daiao 50f5c4a735 实训 2017-03-21 15:20:03 +08:00
daiao cb31eecb07 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-21 15:10:28 +08:00
daiao 2b7c6de55c 实训任务 2017-03-21 15:10:13 +08:00
huang 78c46065f8 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-21 15:02:53 +08:00
huang e95c686ea1 实训编辑功能完善 2017-03-21 15:02:36 +08:00
daiao a9ccb3b7b9 实训任务 2017-03-21 14:15:01 +08:00
huang 8655e91d48 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-21 14:06:14 +08:00
huang 3ae5605e4e 版本库放大所辖 2017-03-21 14:06:04 +08:00
daiao 2b4e61c2bc 实训任务 2017-03-21 14:05:02 +08:00
daiao 6a9684937e Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-21 12:38:21 +08:00
daiao d7d47629ce Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 
Conflicts:
	app/views/games/_tree.html.erb
 2017-03-21 12:38:04 +08:00
huang 63d12a7b36 版本库border 2017-03-21 12:36:20 +08:00
daiao 966ec377a4 实训任务 2017-03-21 12:35:55 +08:00
huang afd73aca64 版本库样式调整 2017-03-21 10:33:52 +08:00
huang f5ba99393e 版本库样式冲突 2017-03-21 10:28:56 +08:00
huang cd30987c88 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-21 10:06:21 +08:00
huang 62ba2e723c 版本库样式调整 2017-03-21 10:06:06 +08:00
daiao 5629b26378 实训任务 2017-03-21 09:58:46 +08:00
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 7044ce8f1a 编辑的时候去掉行头字符 2017-03-21 09:03:19 +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 b054510fb7 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-20 15:42:19 +08:00
daiao 8708fa4afc 实训任务 2017-03-20 15:41:56 +08:00
huang 0d4928da24 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-20 14:51:28 +08:00
huang 48913a3c8c 公共方法封装 2017-03-20 14:51:07 +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