Commit Graph

667 Commits

Author SHA1 Message Date
huang 48559195f9 评测失败添加等级提示 2017-05-23 21:26:42 +08:00
huang dfafc158f9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:56:59 +08:00
huang 63435b5d00 发布和更新challenge错误提示等级 2017-05-23 20:56:36 +08:00
daiao e4c687fa80 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:55:25 +08:00
daiao 25796ec87e 实训editorMD加入公式编辑显示 2017-05-23 20:55:06 +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 d71a829d57 我的课堂 2017-05-23 20:32:29 +08:00
daiao 2b51198c67 我的课堂 2017-05-23 20:26:02 +08:00
huang be33dad84d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:06:43 +08:00
huang 81294a0616 个人首页课程、实训超过8个点击跳至相应社区页 2017-05-23 20:06:24 +08:00
Linda b0526b50d9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:02:40 +08:00
Linda 068977c90b 班级作业的搜索框内icon没有上下居中 2017-05-23 20:00:42 +08:00
Linda 322ff780a4 班级的位置栏和右侧tip显示需要调整 2017-05-23 19:53:22 +08:00
Linda fd03f58b1f 班级头部的邀请码可以突出显示 2017-05-23 19:46:42 +08:00
Linda 8711196017 课程的授课大纲编辑icon位置需要调整 2017-05-23 19:42:40 +08:00
Linda 903a23d8e8 智能课堂首页的icon没有显示悬浮提示 2017-05-23 19:32:39 +08:00
Linda 1ac90b3d42 智能课堂首页的筛选块显示样式调整 2017-05-23 19:25:34 +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
Linda a61e20ba07 身份认证的步骤样式不够理想,请参照修改 2017-05-23 18:59:58 +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
Linda f281017cec Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 17:34:25 +08:00
Linda 62f8bc9986 课程教师团队的管理员icon显示调整 2017-05-23 17:33:47 +08:00
Linda 32088f23a4 主页的实训列表icon请与课堂保持一致 2017-05-23 17:10:35 +08:00
Linda eb80de9b96 实训重置代码按钮点击后出现的弹框,文字大小不一致? 2017-05-23 17:07:26 +08:00
Linda 3d643550e5 课程的图片“更换图片”应该是鼠标悬浮样式,而不是始终显示 2017-05-23 16:15:49 +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
Linda 0931d17c14 激活账号提示页的底部按钮样式需要调整 2017-05-23 15:41:04 +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
Linda b522988329 实训项目的首页头部,请调整按钮位置 2017-05-23 15:24:40 +08:00
Linda 94da0f9bb7 班级作业列表的标签和菜单icon没有居中 2017-05-23 15:19:05 +08:00
cxt 935922b365 普通、编程、分组作业的提交和编辑 2017-05-23 15:18:53 +08:00
huang c50b7b57e7 作品详情添加评论 2017-05-23 14:53:35 +08:00
Linda bdea0c45bc 作业、通知、留言动态的小齿轮及其菜单样式请替换成最新样式">作业、通知、留言动态的小齿轮及其菜单样式请替换成最新样式 2017-05-23 14:33:25 +08:00
Linda 739acba3fc 班级成员列表的位置栏需要调整 2017-05-23 13:35:49 +08:00
Linda 0b280160c2 登录页的文字处理一下 2017-05-23 11:18:28 +08:00
Linda 63382736b1 TPM点击任务列表的提示弹框没有使用公共样式 2017-05-23 11:06:17 +08:00
Linda 142cfb5b59 班级头部的中间行的文字信息最好大小一致 2017-05-23 10:58:49 +08:00
Linda 7d4a392310 平台首页的顶部导航栏与内页的导航栏没有一致 2017-05-23 10:25:23 +08:00
Linda 3933f9a6e3 平台首页的智能课堂块,用的icon与智能课堂的首页使用的icon不一致 2017-05-23 09:38:25 +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 903525ded6 实训添加JDBC类型 2017-05-22 16:36:15 +08:00
huang d76bbb372b 个人主页添加实训链接 2017-05-22 16:34:18 +08:00
huang 72edf00095 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-22 16:29:57 +08:00
huang 329a5b1004 challenge更新的时候异常界面显示及数据一致性处理 2017-05-22 16:29:36 +08:00
huang 65e85e7bdc 实训作业(未完) 2017-05-22 15:52:45 +08:00
Linda 7b32872358 班级宽度调整为1200px 2017-05-22 15:22:24 +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 d35809b59f 解决个人主页实训数据不一致问题 2017-05-21 15:56:14 +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 35f0faf567 重新评测结果没有及时返回问题 2017-05-19 21:39:57 +08:00
huang 8bc064bc1c 实训重置失败跳转及提示 2017-05-19 20:49:33 +08:00
daiao 52230c5700 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 20:37:20 +08:00
daiao fcf25603d7 样式修改 2017-05-19 20:37:07 +08:00
huang 9492725fc8 challenge链接更新问题 2017-05-19 20:36:41 +08:00
daiao 4428e74f52 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 20:04:30 +08:00
huang 2efa4b73f5 隐藏实训统计 2017-05-19 19:56:54 +08:00
daiao 77ce7da426 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 19:39:24 +08:00
daiao a8401ac241 作业列表7个tab与收缩框并列查询 2017-05-19 19:39:04 +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
huang f88bf9bcdb 实训添加合作者功能 2017-05-19 16:56:09 +08:00
daiao 0f488e82e0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:45:21 +08:00
daiao 9c801959fb 我的主页课堂列表与课程页列表添加切换列表事件 2017-05-19 16:44:57 +08:00
Linda a0d76041cd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:04:50 +08:00
Linda 006fec71a7 智能课堂的首页,请按照游戏实训优化整体效果 2017-05-19 16:04:30 +08:00
daiao 1726160436 测试集通过后右侧显示的icon不正确 2017-05-19 16:00:46 +08:00
daiao c2101ad90b 新版上传头像的弹框 2017-05-19 15:46:19 +08:00
daiao 1ae51c748d 个人主页点击更换头像请跳转到基本资料的头像页 2017-05-19 15:30:16 +08:00
daiao 2f6a9c2d86 “查看光辉历史”没有效果 2017-05-19 15:22:08 +08:00
Linda 87ceaca558 实训项目的统计页显示错乱 2017-05-19 15:07:26 +08:00
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
Linda 5cec15cd3b 新建班级页按照新建课程调整 2017-05-19 11:30:10 +08:00
Linda 2f0b7cac4a 主页的快速入口为空时,右侧的下拉菜单无法使用 2017-05-19 11:15:29 +08:00
huang aa7bb35cc9 个人主页实训tab 2017-05-19 10:34:56 +08:00
Linda d9a91a2963 个人主页悬浮课堂列表时,不应该班级和课程名称同时变色 2017-05-19 10:33:27 +08:00
Linda 7f572ea33f 教师团队模块文字超出样式错乱问题 2017-05-19 10:00:40 +08:00
Linda 372ee46220 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 09:30:41 +08:00
huang f46860d15b 作品评阅结果列表及申述状态修改 2017-05-18 20:59:07 +08:00
huang ea087b8b40 实训评测没反应问题 2017-05-18 19:48:54 +08:00
huang ed8b14bce1 作品列表相关功能补充 2017-05-18 19:40:51 +08:00