Commit Graph

321 Commits

Author SHA1 Message Date
forge01 1ba3d74364 修复代码重置失败的问题 2017-10-17 16:54:24 +08:00
huang 368005f101 申诉状态修正 2017-10-17 09:28:38 +08:00
huang 36484ee395 博客路由定义 2017-10-17 09:26:31 +08:00
huang 9660025ba3 添加实训统计信息接口 2017-10-17 09:25:01 +08:00
huang f3e4a57999 添加新的镜像 2017-10-17 09:22:38 +08:00
huang 7b5c9150bb 实训权限控制 2017-10-17 09:21:40 +08:00
huang 0b4aed3806 pushlish game的时候同步tpi脚本 2017-10-14 11:09:15 +08:00
cxt a3cf8e9697 实训路径优化 2017-10-13 16:23:39 +08:00
cxt abf3f953e0 作业列表的序号 2017-10-12 18:51:47 +08:00
huang 5fe03a3ec6 添加实训脚本迁移;实训技术平台增加PHP、PHP/web 2017-10-12 10:51:25 +08:00
huang d5fb001c1c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-11 14:48:35 +08:00
huang 2e085f9e5d 实训添加几种镜像 2017-10-11 14:48:15 +08:00
cxt cd6486671f 课堂的作业列表按照发布时间倒序排序 2017-10-09 14:38:54 +08:00
daiao 49ffc348e2 Merge branch 'dev_daiao' into develop
Conflicts:
	app/views/games/_shixun_comment_list.html.erb
2017-09-30 21:40:23 +08:00
cxt f4ba07cc82 学生匿评多次时,应该覆盖上一条评分,且给出提交弹框的内容改为“评分已更新” 2017-09-30 20:46:57 +08:00
daiao e00bb90c23 Merge branch 'develop' into dev_daiao
Conflicts:
	app/views/games/_shixun_comment_list.html.erb
	app/views/layouts/_logined_header.html.erb
2017-09-30 19:51:30 +08:00
daiao 7dcc150a25 贴吧缺陷修复 2017-09-30 19:49:53 +08:00
daiao a5289610a3 实训TPI的回复 2017-09-30 19:23:38 +08:00
cxt b17305f848 bug修复 2017-09-30 17:38:17 +08:00
cxt 91ba070ca8 Merge branch 'dev_cxt' into develop
Conflicts:
	app/helpers/application_helper.rb
	app/views/messages/_course_show.html.erb
	app/views/student_work/index.html.erb
	public/stylesheets/css/taskstyle.css
2017-09-30 16:33:07 +08:00
cxt 799d97d640 老师评阅 2017-09-30 14:36:17 +08:00
huang 3c19e12081 实训版本库代码同步功能 2017-09-30 10:42:26 +08:00
daiao 60a1e135a8 Merge branch 'dev_daiao' into develop 2017-09-29 16:03:57 +08:00
cxt 37f5b9ff46 试卷作品列表 2017-09-29 10:20:09 +08:00
huang d2138f41bd 测试集 2017-09-28 19:27:27 +08:00
cxt 7aef72d7a3 在线试卷 2017-09-28 16:51:15 +08:00
cxt 5f1d6cd962 作业的统计 2017-09-26 15:32:31 +08:00
cxt ae2dedec92 Merge branch 'develop' into dev_cxt 2017-09-26 15:18:22 +08:00
daiao a1a045b135 选择题结构更改,保留用户多次评测的结果 2017-09-26 15:03:28 +08:00
daiao 71e7725e5c 贴吧 2017-09-26 08:40:27 +08:00
cxt 483c27cb20 作业列表显示的未评数与作业详情中的未评数不一致 2017-09-25 15:49:17 +08:00
cxt 5f185c0cd7 课堂作业的“挂起”改为未发布 2017-09-25 10:40:34 +08:00
daiao ced586aca9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 17:29:55 +08:00
daiao 8e9b719b0f 实训的每一关要增加开始玩、玩的入口 2017-09-22 17:29:25 +08:00
cxt 42351bc93d Merge branch 'dev_cxt' into dev_cs
Conflicts:
	app/views/layouts/_group_children_list.html.erb
	app/views/subjects/new.html.erb
2017-09-22 14:56:43 +08:00
cxt 0f69140692 作品列表中的匿评作品按钮需要删除 2017-09-22 14:45:20 +08:00
cxt 48de3d1f35 实训作业成绩的实时更新 2017-09-22 14:36:01 +08:00
cxt ac92ba649d 作业 2017-09-22 11:18:12 +08:00
cxt 2a619272bb 实训作业选择bug和延时提交 2017-09-22 11:16:30 +08:00
caishi b4b296d130 Merge branch 'develop' into dev_cs
Conflicts:
	app/views/challenges/_single_or_multiple_question_show.html.erb
2017-09-22 08:51:34 +08:00
caishi 219ff96ea0 增加在线课堂的教师或者助教待审批提醒,且更换样式 2017-09-21 18:29:07 +08:00
cxt 86e2f60946 Merge branch 'develop' into dev_cxt
Conflicts:
	app/controllers/shixuns_controller.rb
	app/views/subjects/new.html.erb
	public/javascripts/edu/base_edu.js
2017-09-21 17:46:58 +08:00
cxt 6e5ff7cc9a 继续实战 2017-09-21 17:17:53 +08:00
cxt df5b70a558 继续实战报500 2017-09-21 17:07:21 +08:00
cxt 33580f1e20 增加实训平台“verilog” 2017-09-21 15:51:47 +08:00
cxt 0b38eca942 实训作业的完成情况实时更新 2017-09-21 15:50:08 +08:00
caishi b5c7c5a8d8 班级添加学生、教师默认只添加与主讲人所在单位一致的学生 2017-09-21 11:19:44 +08:00
cxt cefc5edbfe 实训路径的简介、学习须知,请改为 ke 编辑器,需要插入图片 2017-09-21 11:07:44 +08:00
caishi da6d67eb35 动态资源列表、讨论列表调整 2017-09-20 14:27:13 +08:00
cxt 113df24943 作业列表请显示发布时间 2017-09-20 11:23:25 +08:00