Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,449 Commits 2 Branches 0 Tags 163 MiB
Commit Graph

980 Commits

Author SHA1 Message Date
daiao a5289610a3 实训TPI的回复 2017-09-30 19:23:38 +08:00
daiao 7c024985bf 单选多选题答题模式修改 2017-09-25 11:16:16 +08:00
miss 5af447875e ajax加载层级调整 2017-09-24 10:34:48 +08:00
cxt 3f3f3804ba Merge branch 'dev_cs' into develop 2017-09-22 21:10:31 +08:00
cxt 4d408ded24 添加教师的调整 2017-09-22 21:09:35 +08:00
miss a0d2420e44 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:57:49 +08:00
miss c6a8b13f97 学员统计分页字体颜色 2017-09-22 20:57:23 +08:00
caishi ecd081030b 成员管理数字跳转 2017-09-22 20:42:58 +08:00
cxt 5fc722a5cd 添加学生的弹框调整 2017-09-22 20:37:44 +08:00
caishi a249e74526 字体颜色 2017-09-22 19:51:03 +08:00
XuCheng642 23550b8923 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/controllers/managements_controller.rb
 2017-09-22 18:48:03 +08:00
XuCheng642 5cd22581ba 管理员界面修改 2017-09-22 18:40:22 +08:00
miss 328ad9546a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 17:21:05 +08:00
cxt 21b1fc32d9 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/views/student_work/show.html.erb
 2017-09-22 17:20:25 +08:00
miss e3b64c1e26 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	public/stylesheets/css/ketang.css
#	public/stylesheets/css/taskstyle.css
 2017-09-22 17:17:51 +08:00
caishi 78874ff0cc Merge branch 'dev_cs' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/helpers/student_work_helper.rb
	app/views/courses/sync_students.js.erb
 2017-09-22 17:12:37 +08:00
cxt 758d1bf39d 作品匿评的调整 2017-09-22 17:04:40 +08:00
miss 41ec6a4838 在线课堂缩小后内容显示换行了，tpm设置板块样式问题 2017-09-22 16:40:58 +08:00
caishi 6299969267 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-22 16:31:56 +08:00
caishi 679b5a559d 增加多个选择题tab样式问题 2017-09-22 16:31:22 +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
miss 9076facbca Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/views/shixuns/settings.html.erb
 2017-09-22 14:50:53 +08:00
miss 76a3026f97 step3学员统计板块，二次回复的提示，作品页样式的调整，实训tpm配置页面上边线没有阴影。我的关注以及我的粉丝页面样式及tip问题，编辑作业给出的错误提示框无法关闭的问题，新建作业时显示的下拉列表的文字错乱问题，我的题库详情页面的菜单按钮的位置调整，班级所有页面的阴影背景色的修改。个人主页，实训，课程的tab的统一，班级成员管理的tip出现条件以及出现位置的修改 2017-09-22 14:47:53 +08:00
huang a234bdc01b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 10:47:41 +08:00
huang 821abc8434 实训复制添加提醒及过渡动画 2017-09-22 10:38:56 +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
XuCheng642 552953b408 Merge branch 'develop' into dev_xucheng 2017-09-21 21:00:54 +08:00
XuCheng642 ad993b64d1 管理员界面消息列表 2017-09-21 20:59:39 +08:00
caishi 219ff96ea0 增加在线课堂的教师或者助教待审批提醒，且更换样式 2017-09-21 18:29:07 +08:00
daiao 9ce12c0ada 上线缺陷修复 2017-09-21 18:13:08 +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
daiao 500aa17ab0 火狐浏览器TPI加载中转转圈样式调整 2017-09-21 14:45:38 +08:00
caishi 9bdcfc6b9d body样式 2017-09-21 14:21:50 +08:00
caishi b5c7c5a8d8 班级添加学生、教师默认只添加与主讲人所在单位一致的学生 2017-09-21 11:19:44 +08:00
cxt cefc5edbfe 实训路径的简介、学习须知，请改为 ke 编辑器，需要插入图片 2017-09-21 11:07:44 +08:00
daiao 4d6b0f5cda 全部任务中金币数值和评测中的金币数值需保持一致 2017-09-21 10:37:35 +08:00
daiao 386a7b4d06 实训tpi的评论数字样式不对 2017-09-21 10:00:05 +08:00
caishi ee65fd18fb 选择题任务通过后，遮罩弹框信息修改 2017-09-20 17:16:11 +08:00
daiao 25abf51158 实训版本库的样式与其它页面不一致 2017-09-20 17:04:35 +08:00
caishi da6d67eb35 动态资源列表、讨论列表调整 2017-09-20 14:27:13 +08:00
daiao 833be4dbaa 训路径的简介、学习须知，请改为 ke 编辑器 2017-09-20 11:16:26 +08:00
caishi a09450a805 Merge branch 'dev_cs' into develop 
Conflicts:
	app/views/games/_choice_question.html.erb
 2017-09-19 17:17:40 +08:00
caishi df60c289ad 选择题选项换行、开始实战的加载层 2017-09-19 17:15:50 +08:00
caishi 3eb85ee6f9 问吧 2017-09-19 09:12:47 +08:00
cxt f91deb919a 评阅作品时，不要给出一个-1的默认值 2017-09-18 16:23:06 +08:00
cxt 71709212cb 新建分班后跳到全部学生列表 2017-09-18 15:27:58 +08:00
cxt c8a484f109 删除分班后，左侧菜单栏没有刷新 2017-09-18 14:25:42 +08:00
cxt 0023e8b32f 在线课堂-作业挂起时请显示设置的发布时间 2017-09-18 10:42:30 +08:00
daiao 63aed6be25 C语言评测实际输出与中间层统一 2017-09-18 10:12:50 +08:00
daiao 09b3e5dc46 测试集特殊字符匹配 2017-09-18 08:44:08 +08:00