Commit Graph

1160 Commits

Author SHA1 Message Date
caishi c7ac2bdb41 Merge branch 'dev_cxt' into dev_cs
Conflicts:
	app/views/messages/_course_show.html.erb
	app/views/student_work/index.html.erb
2017-09-30 18:27:00 +08:00
cxt 1b5b77b6c5 测验的编辑 2017-09-30 16:10:07 +08:00
cxt 799d97d640 老师评阅 2017-09-30 14:36:17 +08:00
XuCheng642 fbf3d3f747 作业回复链接 2017-09-29 21:53:08 +08:00
XuCheng642 811ea0f324 Merge branch 'develop' into dev_xucheng
Conflicts:
	app/views/managements/_leave_message_list.html.erb
2017-09-29 20:18:23 +08:00
XuCheng642 4617e8d803 自动授权学校 2017-09-29 18:44:40 +08:00
XuCheng642 231fa0dcf7 链接 2017-09-29 18:38:21 +08:00
cxt f98f554aaf 试卷 2017-09-29 18:18:38 +08:00
XuCheng642 d679111b41 Merge branch 'develop' into dev_xucheng
Conflicts:
	app/views/shixuns/_shixun_top.html.erb
	public/stylesheets/css/edu-common.css
2017-09-29 16:35:44 +08:00
XuCheng642 cbb648dd40 自动授权列表 2017-09-29 16:18:41 +08:00
daiao 60a1e135a8 Merge branch 'dev_daiao' into develop 2017-09-29 16:03:57 +08:00
daiao 17c145a0f5 讨论评论无法局部刷新 2017-09-29 16:02:08 +08:00
cxt e13bb9316f 试卷的插入、上下移动、删除等功能 2017-09-29 15:55:37 +08:00
daiao f88832796b 讨论按照置顶与非指定排序 2017-09-29 11:29:09 +08:00
daiao b023d5fbaf 顶部导航的“论坛”页面 2017-09-29 11:13:16 +08:00
miss dfe5fe828e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-29 11:11:01 +08:00
cxt 37f5b9ff46 试卷作品列表 2017-09-29 10:20:09 +08:00
huang d2138f41bd 测试集 2017-09-28 19:27:27 +08:00
huang 8987c8a5e1 修改测试集不能需要重置实训 2017-09-28 19:21:58 +08:00
daiao aa4ec780b7 讨论详情页二级回复功能 2017-09-28 17:29:36 +08:00
cxt 7aef72d7a3 在线试卷 2017-09-28 16:51:15 +08:00
huang e46c4a57e3 发布了修改版本也会触发事件 2017-09-28 16:20:05 +08:00
miss 3602ecfad2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-28 16:11:02 +08:00
miss e070769613 tip调整 2017-09-28 16:10:26 +08:00
daiao bfd4ee86ec 一级回复与点赞功能 2017-09-28 15:28:03 +08:00
huang fad2fb478f 实训复制失败添加日志区分 2017-09-28 14:12:42 +08:00
huang 3ce5368a9a 老师角色 2017-09-28 11:29:05 +08:00
huang fc0673e6d7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-28 11:11:40 +08:00
huang 76cd81ec8e 复制权限修改 2017-09-28 11:11:15 +08:00
daiao 8a41a9aea1 新建、删除选择题需要重置关卡,删除关卡时,给出提示。 2017-09-27 10:27:51 +08:00
daiao 82bb30622f 删除关卡报500 2017-09-27 08:47:48 +08:00
daiao f07104bdb2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-26 16:14:26 +08:00
daiao 6e27beea08 选择题权限控制 2017-09-26 16:14:14 +08:00
cxt bf634b56e1 实训统计调整 2017-09-26 15:53:17 +08:00
huang 3ec5a7991f 已发布的实训如果修改实训的“技术平台”不触发强制重置 2017-09-26 15:47:31 +08:00
cxt 0ad0577896 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-26 15:14:17 +08:00
cxt 31f199a3f6 实训统计调整 2017-09-26 15:13:57 +08:00
daiao 571b59ca60 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-26 15:04:08 +08:00
daiao a1a045b135 选择题结构更改,保留用户多次评测的结果 2017-09-26 15:03:28 +08:00
miss 0b509f2195 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-26 14:45:48 +08:00
cxt e4147ef758 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-26 14:31:22 +08:00
cxt 016741ed35 超级管理员的实训作业统计 2017-09-26 14:31:04 +08:00
daiao 859bcd3c8e 选择题的参考答案需要默认生成1个+选择题没有评测时,点击评测结果的提示语错误 2017-09-26 09:00:30 +08:00
daiao 71e7725e5c 贴吧 2017-09-26 08:40:27 +08:00
miss b631935c30 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-25 16:50:05 +08:00
miss d33cbbb699 issue列表的修改 2017-09-25 16:49:35 +08:00
daiao 5eaef1abe3 实训选择题 2017-09-25 14:16:45 +08:00
daiao 7c024985bf 单选多选题答题模式修改 2017-09-25 11:16:16 +08:00
daiao 539902fa79 超级管理员导出EXCEL 2017-09-25 08:56:51 +08:00
huang 89b2c76ad2 修复403问题 2017-09-22 22:51:44 +08:00