Commit Graph

300 Commits

Author SHA1 Message Date
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 8454330981 作业动态的齿轮菜单内容请修正 2017-05-26 15:46:26 +08:00
cxt 1a9c35b26f 请确认效果显示,默认应该是1蓝色,2灰色。审核通过后则1,2均蓝色 2017-05-26 14:19:06 +08:00
daiao 77cf39eb54 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-26 11:08:29 +08:00
daiao 95956a5004 配置页面 2017-05-26 11:08:06 +08:00
cxt 1600f11444 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-26 10:35:00 +08:00
cxt bf317dba48 班级的教师或助教点击头部的“教师”“学生”“分班”应该进入成员管理的相应页面 2017-05-26 10:34:25 +08:00
huang d3602d9251 重新评测最后一关通过的时候显示通过所有关 2017-05-26 09:48:06 +08:00
huang 78a67570c7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-25 17:41:43 +08:00
huang 909255876e game下一关加积分问题 2017-05-25 17:41:28 +08:00
daiao 441629b13f 隐藏班级模块 2017-05-25 17:40:44 +08:00
cxt 96db0b75f9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/views/account/user_join.html.erb
	app/views/layouts/base_edu_course.html.erb
2017-05-25 17:34:51 +08:00
cxt 97f5abe976 成员管理 2017-05-25 17:26:46 +08:00
huang 561f49e715 game点击参考答案无效问题 2017-05-25 16:52:08 +08:00
Linda bd4cfa9e2d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-25 15:52:36 +08:00
huang 22421aa130 game查看扣分问题 2017-05-25 15:49:25 +08:00
Linda 5ce5aa2825 班级的模块设置 2017-05-25 15:16:59 +08:00
daiao 751a9b1f57 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-25 10:10:12 +08:00
daiao e904966b84 实训每通过一关,实训全部列表要刷新 2017-05-25 10:09:53 +08:00
cxt ce440eacb0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/views/syllabuses/_syllabus_homeworks.html.erb
2017-05-24 21:07:32 +08:00
daiao 5899f33a96 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-24 20:45:52 +08:00
daiao abd76377d7 TPI的“查看光辉历史”显示的内容并非实时的 2017-05-24 20:45:39 +08:00
huang a4521300a5 实训首页统计修正:改为在验证的实训中统计情况 2017-05-24 20:22:52 +08:00
cxt 0224442439 作业的匿评设置选择了匿评,但是评分设置无法正确显示、评分设置选择了“单项评分优先”却无法正确保存 2017-05-24 19:57:59 +08:00
huang 129447ca9d 查看答案的时候更新头部分数 2017-05-24 17:39:36 +08:00
cxt 4aa6c830b2 作业标签状态有显示空白的 2017-05-24 17:17:00 +08:00
daiao c678387e1c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-24 16:53:48 +08:00
daiao f49f565c7e 底部导航栏固定在底部 2017-05-24 16:53:23 +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 8f0a0e94f2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-24 16:28:52 +08:00
cxt 55e04d2886 作业详情页的回复 2017-05-24 10:49:33 +08:00
huang 772daf288a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-24 10:12:07 +08:00
huang cf8d52a5bd 重置相关代码错误提示 2017-05-24 10:11:45 +08:00
daiao 804be70dd1 “我的课堂”的标签请更新为“我的课堂” 2017-05-24 09:24:12 +08:00
cxt 49ca398d67 Merge branch 'dev_cxt' into develop 2017-05-23 22:56:23 +08:00
cxt 599869f970 作业的回复 2017-05-23 22:55:20 +08:00
daiao 406026beea Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 22:27:16 +08:00
daiao 41fcb10da7 课程模块隐藏 2017-05-23 22:27:02 +08:00
huang 8f0369f75e 课程位置定位“只能课堂”链接错误 2017-05-23 22:14:38 +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 47de3fdbd2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:45:16 +08:00
huang 18f55234f7 实训开启成功弹框样式及提示信息修改 2017-05-23 20:44:57 +08:00
daiao cd04de5c1b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:32:40 +08:00
daiao 2b51198c67 我的课堂 2017-05-23 20:26:02 +08:00
huang ed5e500ca1 查看他人的主页实训只能看到认证的 2017-05-23 19:23:15 +08:00
huang 128d840037 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 19:05:19 +08:00