Commit Graph

129 Commits

Author SHA1 Message Date
chenglong 8e2cce8fd2 静态页面的修改 2017-04-21 20:06:54 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
cxt c49191b70f Merge branch 'develop' into dev_cxt 2017-04-18 10:30:36 +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
cxt cf24bf1f75 资源库的数据迁移 2017-04-18 09:03:39 +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
daiao 05dbce6fa9 codemirror高度自动填充 2017-04-17 17:01:28 +08:00
huang dba6d72570 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 16:30:55 +08:00
huang 4a950dbdfb 开启实训异常处理及跳转更新 2017-04-17 16:30:37 +08:00
daiao 1b7a973b73 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 15:52:07 +08:00
daiao 02978101e4 实训tpi的全部任务 2017-04-17 15:51:44 +08:00
huang f6998fb6ab 实训发布增加权限控制 2017-04-17 15:39:01 +08:00
huang 4c5b92cf88 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 15:30:51 +08:00
huang 3f9498c6f7 实训发布异常处理 2017-04-17 15:30:31 +08:00
daiao 7476215df3 tpm的详情页面加入锁定与未锁定样式 2017-04-17 15:30:07 +08:00
daiao b65b58a595 TPM的编辑模式的锁定 2017-04-17 15:16:42 +08:00
huang 4051e5a372 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 14:59:35 +08:00
daiao fe906b388a TMP编辑模式调整 2017-04-17 14:58:51 +08:00
huang f5791f198a Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 14:57:57 +08:00
huang 5b0982f358 新建challenge异常处理及公开私有调整 2017-04-17 14:57:20 +08:00
daiao 62f93013a6 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 14:45:54 +08:00
daiao 856a96393e tpi测试结果按照隐藏测试集与非隐藏测试集分开排列,默认展开第一个测试集 2017-04-17 14:45:42 +08:00
huang c05964be61 challenge编辑功能 2017-04-17 14:41:23 +08:00
huang 59a6ee56d3 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 14:38:22 +08:00
huang a0c88d755c 编辑模式 2017-04-17 14:37:39 +08:00
daiao 968fc3fa54 TPI的全部任务做成渐入浅出的效果 2017-04-17 13:59:58 +08:00
daiao 6050a25fee Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-17 10:29:34 +08:00
daiao e7c7594762 使用百度模板做测试集 2017-04-17 10:29:15 +08:00
huang 9328c771b0 challenge show页面数据调整 2017-04-17 10:11:17 +08:00
huang 67af31b8cc 发布实训接口 2017-04-16 17:20:47 +08:00
daiao 2bc0080ed7 tpm锁定功能 2017-04-16 14:01:10 +08:00
huang 37731c30ae Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
	app/views/challenges/_form.html.erb
2017-04-16 10:17:09 +08:00
huang 62b579df71 game结果列表实时刷新 2017-04-16 10:16:36 +08:00
daiao e99b3399f0 tpm新建和编辑锁定模式 2017-04-16 10:15:30 +08:00
daiao 6f2a55984b tpm调整 2017-04-14 17:54:25 +08:00
daiao 7531fcc05d tmp解决冲突 2017-04-14 17:49:56 +08:00
daiao 05be4e2207 tpm测试 2017-04-14 17:47:24 +08:00
daiao ebc5d24e61 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
	app/views/games/_game_results.html.erb
2017-04-14 17:45:07 +08:00
daiao be88824786 tpm测试 2017-04-14 17:40:46 +08:00
huang 566b9876c5 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-14 16:55:33 +08:00
huang 0fdc400e52 game底端时间显示调整 2017-04-14 16:55:14 +08:00
daiao 18c2acc051 tpm头部样式调整 2017-04-14 16:41:14 +08:00
daiao 978dc492a2 tpi样式调整 2017-04-14 16:28:04 +08:00
huang 628a7a43fd Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-14 16:13:09 +08:00
huang 99de376266 game测试集结果 2017-04-14 16:12:54 +08:00
daiao d919bf65d6 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-14 15:47:46 +08:00
daiao 080d00ab04 点赞与踩功能 2017-04-14 15:47:20 +08:00