Commit Graph

19354 Commits

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