Commit Graph

163 Commits

Author SHA1 Message Date
huang b8ba0da2b8 矫正接口数据 2017-04-19 21:48:57 +08:00
huang 4de97b9889 logo 2017-04-19 21:14:04 +08:00
huang f13a7f274c Merge branch 'dev_linda' into develop 2017-04-19 21:09:24 +08:00
huang 07031ea8bc 取消注释 2017-04-19 20:45:13 +08:00
huang 298b673560 Merge branch 'dev_huang' into develop 2017-04-19 20:16:42 +08:00
huang b06a9de3ac 修改输入位置 2017-04-19 20:16:02 +08:00
huang 43e6a53244 局部刷新问题 2017-04-19 19:27:17 +08:00
huang a288039919 Merge branch 'develop' into dev_huang
Conflicts:
	public/images/bigdata/bigdata-logo.png
2017-04-19 16:34:16 +08:00
Linda 746d77a85c Merge branch 'develop' into dev_linda 2017-04-19 16:29:27 +08:00
huang 52ebd5b585 Merge branch 'dev_linda' into develop
Conflicts:
	app/views/games/show.html.erb
2017-04-19 16:27:51 +08:00
huang e56e81da93 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-19 16:26:33 +08:00
huang 1a25407a7a 修改版本库获取方式 2017-04-19 16:26:18 +08:00
daiao 465019825f 网页一直请求数据报错,及其TPI样式调整 2017-04-19 16:24:44 +08:00
Linda e6f03441a0 logo替换 2017-04-19 15:48:19 +08:00
huang 2cd0a10437 Merge branch 'dev_linda' into dev_huang
Conflicts:
	app/views/games/show.html.erb
2017-04-19 15:21:30 +08:00
Linda 19f5aaa28a ico 图标替换 2017-04-19 15:15:44 +08:00
huang fd8c4d8e12 gilab修正 2017-04-19 15:08:04 +08:00
huang a9e5a27170 发布实训参数修改 2017-04-19 14:18:36 +08:00
Linda 2a0e42b3f4 底部版权更新 2017-04-19 14:11:23 +08:00
huang de8fa4e831 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
	app/views/challenges/_form.html.erb
2017-04-19 13:54:35 +08:00
huang 6a07f3e21f Merge branch 'develop' into dev_huang 2017-04-19 13:53:41 +08:00
huang 6520faefa0 一些改动 2017-04-19 11:31:52 +08:00
daiao c42960bbad tpi界面调整 2017-04-19 10:37:32 +08:00
huang 9cd328f224 status问题 2017-04-18 23:10:33 +08:00
huang e66512bcd2 测试及为空处理 2017-04-18 23:04:33 +08:00
huang 38c0107a93 添加详细日志 2017-04-18 21:29:02 +08:00
huang 6b373e5d7c 添加日志 2017-04-18 21:12:52 +08:00
huang eaa055a4c7 提交评测添加数据 2017-04-18 21:02:10 +08:00
huang 2f294de330 点击“下一步”局部刷新 2017-04-18 20:26:41 +08:00
huang b277ead985 Merge branch 'dev_huang' into develop 2017-04-18 19:58:22 +08:00
huang dd6b0a2194 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-18 19:57:51 +08:00
huang 7b8ae1fcad Merge branch 'develop' into dev_huang 2017-04-18 19:57:37 +08:00
huang cfc3e45264 没评测前不显示测试比例 2017-04-18 19:56:20 +08:00
daiao 8869a7fc74 tpi界面调整 2017-04-18 19:51:59 +08:00
huang 92fbb7ded9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-04-18 18:20:49 +08:00
huang cf113ed121 Merge branch 'dev_huang' into develop 2017-04-18 18:20:07 +08:00
daiao 1d94d9e373 tmp及其TPi样式调整 2017-04-18 18:15:24 +08:00
huang c43f1babe6 提交评测数据传输 2017-04-18 18:08:42 +08:00
huang c0ca865adf Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-18 17:55:37 +08:00
huang c90dd2e82b 评测结果处理 2017-04-18 17:55:15 +08:00
daiao 1445a271fe 实训TPI点击评测 2017-04-18 17:45:37 +08:00
Linda 4bda94638f tittle提示整体美化 2017-04-18 16:14:45 +08:00
huang a1506c7e28 gameshow显示 2017-04-18 16:14:11 +08:00
huang ea06c30fd3 提交评测返回结果 2017-04-18 14:09:08 +08:00
huang 2907d556ae game_build前后端分离 2017-04-18 10:49:52 +08:00
cxt 49621c37d3 Merge branch 'dev_huang' into develop 2017-04-18 10:26:27 +08:00
huang c839470351 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-18 10:22:48 +08:00
huang 8f53cb5130 提交评测返回数据处理 2017-04-18 10:22:28 +08:00
daiao d670cf8a36 点击测评局部刷新测试集 2017-04-18 09:51:42 +08:00
daiao d174152e7f Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 17:01:44 +08:00