Commit Graph

19325 Commits

Author SHA1 Message Date
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