Commit Graph

272 Commits

Author SHA1 Message Date
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
huang 6a3f9673b5 Merge branch 'dev_cxt' into develop 2017-05-23 19:04:50 +08:00
cxt d1cc36f6b0 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 2017-05-23 18:53:11 +08:00
cxt d64aba1391 作业的编辑 2017-05-23 18:52:58 +08:00
daiao 3fafa137b6 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 16:00:58 +08:00
daiao 522a546ec1 班级的模块设置 2017-05-23 16:00:40 +08:00
huang 4da7520205 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:57:19 +08:00
huang 4b2d81dd8c 分组作业 2017-05-23 15:55:30 +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
huang c50b7b57e7 作品详情添加评论 2017-05-23 14:53:35 +08:00
huang c9593f7d17 实训作业 2017-05-22 21:31:28 +08:00
huang a2fae5a292 0 2017-05-22 17:47:30 +08:00
huang e0191f0934 challenge创建整理 2017-05-22 16:51:44 +08:00
huang 329a5b1004 challenge更新的时候异常界面显示及数据一致性处理 2017-05-22 16:29:36 +08:00
huang 65e85e7bdc 实训作业(未完) 2017-05-22 15:52:45 +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
huang 9fd2d983ef 重置实训参数为空的时候修改 2017-05-21 18:04:22 +08:00
huang e1d4d1af97 Job删除失败的时候添加异常处理 2017-05-21 17:17:56 +08:00
huang 7082591b19 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-21 15:29:43 +08:00
huang b3b74b75c9 我的实训列表问题,实训内容显示问题 2017-05-21 15:26:43 +08:00
daiao d88010dacd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-21 15:00:39 +08:00
daiao 598a11ed19 参考答案点击修改, 课程作业列表tab点击事件调整 2017-05-21 15:00:24 +08:00
huang 514d6d5937 gitlabK重置克隆失败问题及challenge权限控制 2017-05-21 11:35:28 +08:00
huang 8bc064bc1c 实训重置失败跳转及提示 2017-05-19 20:49:33 +08:00
huang ae10991ae6 合作者权限控制 2017-05-19 17:30:30 +08:00
huang 7ad005d28e 合作者提供删除功能 2017-05-19 17:14:15 +08:00
huang 287ddf7115 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:56:31 +08:00