Commit Graph

218 Commits

Author SHA1 Message Date
daiao 1290d85531 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 14:47:02 +08:00
daiao 3d48973cfc 新版身份认证审批 2017-05-19 14:46:45 +08:00
huang aa7bb35cc9 个人主页实训tab 2017-05-19 10:34:56 +08:00
huang ea087b8b40 实训评测没反应问题 2017-05-18 19:48:54 +08:00
huang d04f149083 作品列表并列搜索功能 2017-05-18 16:46:17 +08:00
huang 80421b1281 实训返回内容转换,错误结果换行、缩进处理 2017-05-18 15:55:12 +08:00
huang 8dd6b6ffe4 实训预备知识独立数据迁移及数据读取处理 2017-05-18 14:50:39 +08:00
daiao aa0ed21b8c Merge branch 'dev_daiao' into develop 2017-05-18 14:26:40 +08:00
huang b3ad209dad 点击评测返回久的问题 2017-05-18 14:07:08 +08:00
daiao e0a4a9b1ab TMP新增预备知识页面,新建/配置加入预备知识MD 2017-05-18 11:30:29 +08:00
huang c76ada782d game数据显示 2017-05-18 11:26:35 +08:00
huang 438f7ec7d8 查重页面 2017-05-18 10:18:35 +08:00
huang 4cb7979dcf 代码查重详情 2017-05-17 19:43:05 +08:00
huang f9d7ab161c 完成查重列表 2017-05-17 19:35:06 +08:00
huang c56d6910bd 作品详情评论功能及删除功能 2017-05-17 18:18:00 +08:00
daiao 08c4c7ee79 实训新建页面 2017-05-17 17:19:16 +08:00
huang 59fadefc4f 编程作业、普通作业作品显示 2017-05-17 15:22:48 +08:00
huang 7fbbafeab5 作业列表添加搜索功能及过滤条件 2017-05-16 15:26:56 +08:00
huang 6da6840d73 修复game列表链接问题 2017-05-16 10:19:16 +08:00
daiao de5cd798a9 Merge branch 'develop' into dev_daiao 2017-05-16 09:58:07 +08:00
daiao fcc269150b 智慧课堂首页 2017-05-15 17:24:46 +08:00
huang b48d4298bf tpi中game列表排序问题 2017-05-15 17:00:52 +08:00
daiao f6c760c1cb 智慧课堂首页 2017-05-15 16:59:26 +08:00
huang f0f8228a91 重新评测处理方式修改 2017-05-15 16:37:46 +08:00
daiao 048a16927e Merge branch 'develop' into dev_daiao 2017-05-15 09:13:35 +08:00
huang 5f84ec7d48 resubmit参数问题 2017-05-14 17:41:34 +08:00
guange 86527953be Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-14 15:39:09 +08:00
guange fce131a402 头像裁剪上传 2017-05-14 15:32:35 +08:00
huang 660f23d0fb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-14 15:28:35 +08:00
huang fe350546a9 重新评测的一些修改 2017-05-14 15:28:18 +08:00
daiao 5d1afccb7e 智慧课堂(未完) 2017-05-14 11:21:42 +08:00
cxt cd977bad3a Merge branch 'dev_cxt' into develop
Conflicts:
	public/stylesheets/css/edu-common.css
	public/stylesheets/css/taskstyle.css
2017-05-13 22:26:14 +08:00
cxt 050a62cc7a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-13 22:24:49 +08:00
cxt 0e868b45d7 班级新建和设置(除模块设置) 2017-05-13 22:23:53 +08:00
huang 2d8995b91e 已完成关卡显示状态 2017-05-12 21:48:06 +08:00
huang 0da2b863c3 实训提交的时候编码问题 2017-05-12 21:07:52 +08:00
huang 77f3cd7272 修复回调的时候500问题 2017-05-12 19:43:12 +08:00
huang 6173289be4 game build的时候状态修改 2017-05-12 19:33:26 +08:00
huang 375e0d7486 shixun 参数的一些修改 2017-05-12 17:15:58 +08:00
huang 8807ef0ba5 添加日志和转义 2017-05-12 16:19:38 +08:00
daiao 7c3e55b7bd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-12 15:34:03 +08:00
daiao 95f6ff833a 智慧课堂首页(未完) 2017-05-12 15:33:44 +08:00
huang f3059f84e5 jobName base64编码 2017-05-12 15:20:09 +08:00
huang e4fc59c7cc 重置500问题 2017-05-11 17:19:13 +08:00
huang e88696b2e9 myshixun引入公共方法 2017-05-11 17:04:13 +08:00
huang 5550614a62 jenkins地址 2017-05-11 16:56:32 +08:00
huang 48182c9359 reset的时候删除job 2017-05-11 16:52:00 +08:00
huang a078e0b88b 添加日志 2017-05-11 16:44:24 +08:00
huang 24da90d900 修复git地址问题 2017-05-11 16:24:49 +08:00
daiao 60d10b101d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-11 15:11:17 +08:00