kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,370 Commits 3 Branches 0 Tags 460 MiB
Commit Graph

22370 Commits

Author SHA1 Message Date
huang 7cc12f034d 已发布实训版本库控制权限迁移 2017-09-22 20:04:32 +08:00
huang a95cef0599 实训发布改成除了超级管理员外，其他成员不允许修改 2017-09-22 20:04:09 +08:00
huang 6e2135c0cf excel导入注释弹框 2017-09-22 19:08:00 +08:00
huang 2ac8536575 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 19:05:56 +08:00
huang 759cda61b9 实训复制权限及复制的时候没有复制适用课程 2017-09-22 19:05:37 +08:00
daiao 72ce9a0d11 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 18:49:39 +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
daiao 9b42441e50 实训评论删除，无法局部刷新 2017-09-22 18:47:05 +08:00
XuCheng642 1e46eed639 Merge branch 'dev_xucheng' into develop 2017-09-22 18:42:48 +08:00
XuCheng642 5cd22581ba 管理员界面修改 2017-09-22 18:40:22 +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
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 71656f27c3 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/views/games/_shixun_comment_block.html.erb
 2017-09-22 16:43:07 +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
daiao d9b35e1f5c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 15:47:59 +08:00
daiao 46820b959e 实训查看答案后通关，跳到下一关时全部任务栏显示有误 2017-09-22 15:47:42 +08:00
cxt d35776c925 在线课堂的教师或者助教待审批提醒请增加，另外样式更换 2017-09-22 15:39: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
cxt 0f69140692 作品列表中的匿评作品按钮需要删除 2017-09-22 14:45:20 +08:00
cxt 48de3d1f35 实训作业成绩的实时更新 2017-09-22 14:36:01 +08:00
huang 1c907b5268 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 11:24:22 +08:00
huang 35a1c8b9c2 实训开启评测83问题 2017-09-22 11:23:57 +08:00
daiao 50ac384242 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 11:21:40 +08:00
cxt d934d26a30 注释复制实训的入口 2017-09-22 11:19:28 +08:00
cxt ac92ba649d 作业 2017-09-22 11:18:12 +08:00
cxt 2a619272bb 实训作业选择bug和延时提交 2017-09-22 11:16:30 +08:00
daiao f6f3960ba4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 11:15:47 +08:00
daiao 7570a83142 实训里的反馈，要标明是对哪一关 2017-09-22 11:15:18 +08:00
huang 6f8491ca94 实训复制成功给出提醒 2017-09-22 11:00:08 +08:00
huang 29acff9dde 去掉抛出异常 2017-09-22 10:58:15 +08:00
cxt 0b2f584371 实训作业的设置页面tip 2017-09-22 10:52:23 +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
cxt eced528c8f 把已发布的路径排在最前面 2017-09-22 10:19:59 +08:00
huang 3df0b71d0f 复制的时候添加错误提醒 2017-09-22 10:09:34 +08:00
cxt 305cf26663 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-22 09:52:46 +08:00
huang 8457e4d784 完成实训的复制功能 2017-09-22 09:52:13 +08:00
cxt c71ca7b5a8 课堂的帖子列表增加菜单 2017-09-22 09:50:44 +08:00
caishi d0c508bb27 Merge branch 'develop' into dev_cs 2017-09-22 09:15:56 +08:00
daiao 2c411320ce 编辑时切换另一个没有保存的选择题，页面内容没有刷新 2017-09-22 09:15: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