Commit Graph

89 Commits

Author SHA1 Message Date
daiao 67e74118c4 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 15:41:50 +08:00
daiao 10dc5a9668 点击开启评测 无感知 2017-03-24 15:41:33 +08:00
huang 001a3796c7 根目录刷新显示页面 2017-03-24 15:05:44 +08:00
huang 27c34985ca Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 14:42:32 +08:00
huang b3141348b0 版本库默认打开设置文件 2017-03-24 14:42:10 +08:00
daiao 9e6a146d43 保存按钮放回原来地方 2017-03-24 12:38:44 +08:00
daiao 52d642b51b 默认分支 2017-03-24 12:30:10 +08:00
daiao 932240737c 谷歌浏览器不兼容关闭 2017-03-24 10:43:13 +08:00
huang a4eec42b7f 已通过控制 2017-03-23 20:23:31 +08:00
daiao e4985ce3bd 实训任务 2017-03-23 16:51:32 +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
daiao 2a90ed3a42 实训任务 2017-03-22 14:24:22 +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 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 2b7c6de55c 实训任务 2017-03-21 15:10:13 +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