Commit Graph

30 Commits

Author SHA1 Message Date
caishi 78874ff0cc Merge branch 'dev_cs' into develop
Conflicts:
	app/controllers/student_work_controller.rb
	app/helpers/student_work_helper.rb
	app/views/courses/sync_students.js.erb
2017-09-22 17:12:37 +08:00
cxt 48de3d1f35 实训作业成绩的实时更新 2017-09-22 14:36:01 +08:00
huang a234bdc01b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 10:47:41 +08:00
huang 8457e4d784 完成实训的复制功能 2017-09-22 09:52:13 +08:00
cxt 0b38eca942 实训作业的完成情况实时更新 2017-09-21 15:50:08 +08:00
cxt 4adb8cbab6 实训作业的评分调整 2017-09-11 15:48:02 +08:00
cxt b79f793c96 去掉日志 2017-09-08 15:48:57 +08:00
cxt a8cf183944 完成实训作业的自动评分功能 2017-09-08 15:48:35 +08:00
cxt bfe20231e8 实训作业的评分 2017-09-08 13:04:47 +08:00
huang f207d85e8a 新框架下已打过的实训数据迁移 2017-08-11 14:50:06 +08:00
cxt c11e08512c 正式环境上已经结束的班级 没有进行归档 2017-07-10 10:31:14 +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 72369ff2fd 班级作业的设置和列表变更 2017-06-14 15:01:44 +08:00
huang 42f77281df game status问题 2017-06-14 09:55:57 +08:00
huang 4b380bd126 rake测试 2017-06-13 16:16:05 +08:00
huang 74e2ef9429 添加实训评测任务 2017-06-13 16:03:38 +08:00
cxt 53c355d0e9 申诉中的作品列表不应该显示除自己之外其他学生的姓名和学号,和匿评时保持一致 2017-06-09 14:38:04 +08:00
cxt c999e3f636 申诉结束的rake任务出错 2017-06-09 09:43:49 +08:00
cxt 9ca6f450fe 作业列表、定时执行任务 2017-05-24 16:27:55 +08:00
huang 61f2f632ca Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/homework_common/index.html.erb
	app/views/layouts/base_edu.html.erb
2017-05-22 11:14:18 +08:00
cxt f46bd2ac06 新版作业 2017-05-22 10:29:51 +08:00
daiao 3d48973cfc 新版身份认证审批 2017-05-19 14:46:45 +08:00
huang 5ea6c193f6 允许实训创建者参加挑战 2017-05-08 16:36:08 +08:00
cxt e810d93491 课程资源库 2017-05-03 10:10:27 +08:00
huang 4cc972d3fe admin提供实训认证 2017-04-24 17:29:38 +08:00
cxt 9e7624f90a Merge branch 'dev_cxt' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/css/bigdata-common.css
2017-04-21 22:10:17 +08:00
huang 1a25407a7a 修改版本库获取方式 2017-04-19 16:26:18 +08:00
huang fd8c4d8e12 gilab修正 2017-04-19 15:08:04 +08:00
cxt 6b9b1fe013 部门申请的后台审核 2017-04-14 15:36:23 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00