Commit Graph

113 Commits

Author SHA1 Message Date
cxt 9cf218300c 为了避免数据对不上,在作业结束后加入班级的学员应该在已结束的作品列表中加入空白数据 2017-06-30 09:44:39 +08:00
cxt 3b302de197 匿评的时候头部定位显示出学院姓名,应该显示为匿名 2017-06-29 15:41:52 +08:00
cxt 9bba3752a4 实训阶段的难易度显示不正确 2017-06-28 16:21:37 +08:00
cxt f6bd9846ec Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-28 15:23:36 +08:00
cxt 5508cedb45 实训作业 2017-06-28 15:23:09 +08:00
huang be17994e7a 添加经验值功能 2017-06-26 14:05:39 +08:00
huang b2b4b8cd32 删除实训的时候一并删除shixun_modify记录 2017-06-23 16:14:20 +08:00
huang a99361e89a 开始实训的时候记录默认代开文件初始代码 2017-06-23 10:20:34 +08:00
huang 5022ddaf65 实训参数修改 2017-06-22 21:35:24 +08:00
huang a49c741aae Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-06-22 16:22:43 +08:00
huang 164ac37005 实训的一些修改 2017-06-22 16:21:47 +08:00
cxt 0f804a7588 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
	app/controllers/shixuns_controller.rb
	app/models/shixun.rb
2017-06-22 09:52:20 +08:00
cxt 7dee11fe66 实训的流程更改 2017-06-21 17:26:49 +08:00
huang e07772f20a 解决base64编码空格问题;版本文件初始化 2017-06-21 16:38:50 +08:00
huang 99baf6c018 gameInfo添加base34编码,实训开启的时候参数修改 2017-06-21 10:08:27 +08:00
huang 5c69c4cdda 修改中间层参数名 2017-06-20 16:09:48 +08:00
huang 02bb102dea 修改实训评测接口 2017-06-20 11:34:46 +08:00
huang 08dbaf1c18 实训发布生测测试用例代码封装 2017-06-19 17:01:04 +08:00
cxt c48f1ca3ef Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-16 15:19:20 +08:00
cxt 1aa0ce78c3 新版题库 2017-06-16 15:18:41 +08:00
huang 74e2ef9429 添加实训评测任务 2017-06-13 16:03:38 +08:00
huang 3b57616986 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/edu-class.css
2017-06-09 16:55:22 +08:00
huang a0cff38470 用户列表试用界面 2017-06-08 16:15:24 +08:00
cxt 09a4b41381 发送资源中的班级数据有缺失,没有找到新建的班级 2017-06-08 09:45:28 +08:00
huang 87071cacce 认证 2017-06-07 17:39:24 +08:00
cxt 3c4388869a 普通作业不应该有“进入实训”的入口 2017-06-02 19:19:41 +08:00
cxt 6ff88ef129 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-02 14:27:42 +08:00
cxt 15345d93bd 作品列表的多条件筛选 2017-06-02 14:27:12 +08:00
huang dbe37b1df6 实训中增加过滤条件和搜索结果 2017-06-01 14:35:31 +08:00
daiao 0d29448be7 我的课程完整版 2017-05-27 16:49:45 +08:00
daiao 22d7e92d4c 班级模块功能修复 2017-05-27 14:55:06 +08:00
huang d935388689 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 14:21:56 +08:00
huang ed365cf796 添加实训语言及LOGO;实训认证底层框架 2017-05-27 14:21:31 +08:00
daiao 684777fa10 缺陷 2017-05-27 11:25:56 +08:00
cxt dfb8e6f576 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/views/courses/settings.html.erb
2017-05-27 10:32:17 +08:00
daiao b050ebc2e8 班级模块整体功能完善 2017-05-27 10:27:11 +08:00
cxt 06e9e7f157 发布作业但是没有为每个学生创建一条空记录 2017-05-27 09:58:52 +08:00
cxt c9205eb1ea 修改资料的安全设置中,手机绑定时对于已绑定的手机号显示样式错位 2017-05-26 16:15:52 +08:00
huang 128e24711d 用户认证底层结构 2017-05-26 11:23:32 +08:00
huang a8d6b16046 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-24 16:43:37 +08:00
cxt 9ca6f450fe 作业列表、定时执行任务 2017-05-24 16:27:55 +08:00
huang cf8d52a5bd 重置相关代码错误提示 2017-05-24 10:11:45 +08:00
huang 48559195f9 评测失败添加等级提示 2017-05-23 21:26:42 +08:00
huang 63435b5d00 发布和更新challenge错误提示等级 2017-05-23 20:56:36 +08:00
huang 15b86ea78a 发布实训错误提示等级封装 2017-05-23 20:53:27 +08:00
huang 18f55234f7 实训开启成功弹框样式及提示信息修改 2017-05-23 20:44:57 +08:00
huang 128d840037 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 19:05:19 +08:00
daiao 522a546ec1 班级的模块设置 2017-05-23 16:00:40 +08:00
cxt 1e8a36a8d2 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/student_work/show.html.erb
2017-05-23 15:32:16 +08:00
cxt 935922b365 普通、编程、分组作业的提交和编辑 2017-05-23 15:18:53 +08:00