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

20619 Commits

Author SHA1 Message Date
cxt 41fd331f11 作业列表页面已交人数未去掉删除的学生 2017-07-07 20:49:23 +08:00
cxt 5284e6af8b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-07 20:42:32 +08:00
huang e1e7ac36fd webssh https问题 2017-07-07 20:42:45 +08:00
cxt 130070e95d 实训 2017-07-07 20:42:14 +08:00
huang 66d8ebdc56 https问题 2017-07-07 20:37:02 +08:00
cxt 537bd14aa9 新建作业和题库时关掉提示信息后无法再次显示 2017-07-07 20:36:17 +08:00
cxt 4e59c4e31c 点击侧拉栏的公共题库跳转的是我的题库 2017-07-07 20:27:34 +08:00
cxt 6c404f1e84 班级动态页面，实训作业和编程作业的导出附件需要隐藏掉 2017-07-07 20:20:04 +08:00
cxt a138f404ab 不是教师团队的成员只是班级教师进行班级设置时，在课程名字选项中应该加上该班级目前所属课程 2017-07-07 20:11:49 +08:00
huang 72e355d9ae Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-07 19:15:44 +08:00
daiao 0fea0c9230 管理员实训界面 2017-07-07 19:14:43 +08:00
huang 3b3c3d5a52 解决https问题 2017-07-07 19:14:40 +08:00
daiao 0bf6f86d52 实训非编辑状态时，阶段查看页右上角也增加显示“下一阶段” 2017-07-07 18:50:30 +08:00
cxt 3f276b8f31 实训合并 2017-07-07 18:28:08 +08:00
cxt 47646c6259 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-07 18:25:59 +08:00
cxt 4f3bc9a2e4 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/controllers/shixuns_controller.rb
	app/helpers/application_helper.rb
 2017-07-07 18:25:44 +08:00
cxt 1f85875f9d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/courses/index.html.erb
 2017-07-07 18:23:20 +08:00
daiao 0618c2896a Merge branch 'dev_daiao' into develop 2017-07-07 18:22:54 +08:00
daiao 37e92f38e2 管理员实训界面 2017-07-07 18:22:18 +08:00
cxt 678a5a81f5 班级添加教师页面点击添加合作者，第一次输入人名有数据，取消后再次输入该人名就没有数据出现，需要刷新重新输入才会有数据 2017-07-07 17:35:41 +08:00
daiao 0b3cb82c17 Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao 2017-07-07 17:28:29 +08:00
huang d1f9153858 Merge branch 'dev_daiao' into develop 2017-07-07 17:27:39 +08:00
daiao 7e2de0d3c2 webssh 2017-07-07 17:27:36 +08:00
cxt c7638e0d81 更换管理员中数据过少，不应该有滚动条 2017-07-07 17:26:47 +08:00
huang 9a0b4a5acb Merge branch 'dev_cs' into dev_daiao 2017-07-07 17:26:43 +08:00
huang 535e8b7da9 管理员界面添加webssh选中功能 2017-07-07 17:22:50 +08:00
caishi bfb10f7175 超级管理员的实训列表：实训名称超出范围省略 2017-07-07 17:10:33 +08:00
cxt 6cf279fc9e 在我的课堂中点击非私有成员的班级，会跳转至一个空白页面（火狐） 2017-07-07 17:09:43 +08:00
cxt 83e3c9869f 题库的浏览器title显示应该为题库 2017-07-07 16:47:06 +08:00
huang 3addee8533 Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao 2017-07-07 16:27:20 +08:00
huang 5017464d68 Merge branch 'dev_cs' into dev_daiao 2017-07-07 16:27:00 +08:00
cxt 5ba8c73f1b 实训首页的搜索 2017-07-07 16:17:45 +08:00
huang f0bfcd9a16 管理员界面添加实训功能 2017-07-07 16:02:55 +08:00
huang 65302fbc1d Merge branch 'develop' into dev_cs 2017-07-07 15:43:49 +08:00
huang d4c5d8b10e admin 添加认证 2017-07-07 15:41:02 +08:00
caishi da151894f6 浏览器缩小后左侧导航条部分不遮挡固定区域 2017-07-07 14:52:41 +08:00
daiao acd9dc31d6 Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao 
Conflicts:
	app/views/games/_repository.html.erb
 2017-07-07 14:17:09 +08:00
daiao c0a95be58d webssh测试 2017-07-07 14:13:10 +08:00
huang f4467bc222 webssh添加gameid关联参数 2017-07-07 14:12:40 +08:00
huang a75f477797 合作者拥有编写实训代码的权限 2017-07-07 11:23:15 +08:00
huang 0a65ebb1d0 版本库添加在线编辑功能 2017-07-07 11:04:53 +08:00
Linda 055f1ae169 测试 2017-07-07 09:11:22 +08:00
cxt 2cdac1bd98 Merge branch 'dev_cs' into dev_cxt 2017-07-07 09:10:21 +08:00
Linda 02af9e6b4a 超级管理员的实训列表页面的修改 2017-07-07 09:05:20 +08:00
Linda 5cdacc851b 超级管理员的实训列表页面 2017-07-07 08:58:49 +08:00
cxt 7b9c59d6e8 基础数据加上“专业”、“课程”，实训的适用专业和课程 2017-07-06 17:52:59 +08:00
daiao 788fa96b14 wenssh 2017-07-06 16:13:46 +08:00
huang cd67988902 tpi添加连接webssh及断开webssh接口 2017-07-06 11:32:13 +08:00
huang cffcbad975 Merge branch 'develop' into dev_daiao 2017-07-06 10:48:50 +08:00
huang 37556a7933 webssh类型的实训开启的时候添加webssh实训 2017-07-06 10:48:30 +08:00