Commit Graph

26 Commits

Author SHA1 Message Date
cxt 4d4251ecfc Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 18:40:18 +08:00
caishi 25a39ed828 试卷 2017-09-30 18:38:26 +08:00
cxt 78aded0451 空白块 2017-09-30 18:38:19 +08:00
cxt 216a102f0a 评阅时刷新评阅情况 2017-09-30 18:34:21 +08:00
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
caishi 18b01609cc 保存多选题 2017-09-30 18:23:35 +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
caishi 7771a83ea9 删除选项 2017-09-30 16:30:43 +08:00
cxt 1b5b77b6c5 测验的编辑 2017-09-30 16:10:07 +08:00
cxt 3b25304329 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/exercise/student_exercise_list.html.erb
2017-09-30 14:38:16 +08:00
cxt 799d97d640 老师评阅 2017-09-30 14:36:17 +08:00
caishi cd3c25d600 编辑试卷 2017-09-29 19:25:06 +08:00
cxt f98f554aaf 试卷 2017-09-29 18:18:38 +08:00
cxt e13bb9316f 试卷的插入、上下移动、删除等功能 2017-09-29 15:55:37 +08:00
cxt 786430697b Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 2017-09-29 10:20:27 +08:00
cxt 37f5b9ff46 试卷作品列表 2017-09-29 10:20:09 +08:00
caishi 06940f58b3 显示效果以及点击效果 2017-09-28 19:16:13 +08:00
cxt 7aef72d7a3 在线试卷 2017-09-28 16:51:15 +08:00
caishi 82c5ee1a90 未答 2017-09-26 16:41:31 +08:00
caishi 137eb2739d Issues 2017-09-26 15:38:44 +08:00
caishi 39c4213bbe 实训tpi中预期输出的答案没有从冒号后开始 2017-09-26 11:10:09 +08:00
caishi b47bd5c1bc 试卷页面 2017-09-26 10:40:04 +08:00
daiao b586665b74 没有数据显示时使用的图片更换 2017-06-01 11:16:54 +08:00
Linda 7b32872358 班级宽度调整为1200px 2017-05-22 15:22:24 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00