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

295 Commits

Author SHA1 Message Date
cxt 7b811d67a7 身份为学生，在成员管理中可以对教师申请进行同意或拒绝操作 2017-09-25 15:06:30 +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
caishi ecd081030b 成员管理数字跳转 2017-09-22 20:42:58 +08:00
cxt d230ac9511 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_search_not_students_list.html.erb
 2017-09-22 20:38:55 +08:00
cxt 5fc722a5cd 添加学生的弹框调整 2017-09-22 20:37:44 +08:00
caishi 87dee8cd9d cursor 2017-09-22 19:16:22 +08:00
huang 6e2135c0cf excel导入注释弹框 2017-09-22 19:08:00 +08:00
caishi 85071cb1ae 添加教师、助教 2017-09-22 19:05:39 +08:00
cxt 8c837f3307 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-22 18:50:44 +08:00
caishi 0c53d51b2b 添加学生 2017-09-22 18:49:20 +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 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 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
caishi 219ff96ea0 增加在线课堂的教师或者助教待审批提醒，且更换样式 2017-09-21 18:29:07 +08:00
caishi b5c7c5a8d8 班级添加学生、教师默认只添加与主讲人所在单位一致的学生 2017-09-21 11:19:44 +08:00
cxt 71709212cb 新建分班后跳到全部学生列表 2017-09-18 15:27:58 +08:00
cxt c8a484f109 删除分班后，左侧菜单栏没有刷新 2017-09-18 14:25:42 +08:00
huang 1ec289c197 Merge branch 'develop' into dev_huang 2017-09-18 10:32:02 +08:00
daiao 738fd2f23e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-17 09:42:07 +08:00
daiao a6b99d1a90 实训添加合作者的身份不正确 2017-09-17 09:41:06 +08:00
huang 53bd0be8da Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 23:02:01 +08:00
huang 4e30c42a60 导入结果弹框提醒 2017-09-15 22:59:32 +08:00
cxt a412a42976 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/helpers/courses_helper.rb
 2017-09-15 22:53:47 +08:00
caishi 174cca8e6d Merge branch 'dev_cs' into develop 2017-09-15 22:46:13 +08:00
caishi a4d0c65cad 课堂样式 2017-09-15 22:44:36 +08:00
huang 3a919c36d6 解决分班中导入数据点击没反应的问题 2017-09-15 22:39:27 +08:00
cxt 61f1d9bd10 课堂相关修改 2017-09-15 22:35:36 +08:00
cxt 3d0f1839a7 Merge branch 'dev_cs' into develop 
Conflicts:
	app/views/challenges/_single_or_multiple_question.html.erb
	app/views/messages/_common_reply_box.html.erb
	app/views/praise_tread/_edu_praise.html.erb
	app/views/student_work/_common_reply_box.html.erb
 2017-09-15 21:05:56 +08:00
cxt a69dc16af5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list_block.html.erb
 2017-09-15 21:02:10 +08:00
cxt d2d388972a 班级页面的分班 2017-09-15 20:59:35 +08:00
daiao 0a1359d7a3 检索为空时，点击点击叉叉，也会刷新页面 2017-09-15 20:32:15 +08:00
daiao c6a7362051 在线课堂的加入学生、老师弹框，实训tpm的添加合作者显示的用户职业不正确 2017-09-15 20:20:01 +08:00
huang 9f10b14466 合并代码后添加入口 2017-09-15 19:41:10 +08:00
huang 730e8264c0 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/controllers/courses_controller.rb
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 19:09:31 +08:00
huang d713ce6de0 批量导入Excel文件到课程列表 2017-09-15 19:03:36 +08:00
XuCheng642 ac28f83271 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/controllers/managements_controller.rb
	app/helpers/application_helper.rb
	app/views/subjects/_subject_list.html.erb
	config/routes.rb
 2017-09-15 18:35:37 +08:00
caishi e138c204e0 分班 2017-09-15 17:08:16 +08:00
cxt 508139c57c Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 15:12:09 +08:00
cxt 6469fc1563 课堂的调整 2017-09-15 15:10:35 +08:00
huang 3e07f18be5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 10:55:32 +08:00
huang 63cd1ba6ab 新 2017-09-15 10:50:05 +08:00
caishi ca558efac1 上传学生信息文件 2017-09-15 10:12:42 +08:00
XuCheng642 d33e79dc86 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/controllers/managements_controller.rb
 2017-09-14 19:30:36 +08:00
XuCheng642 f9e4385226 问题修改2017 09 11 2017-09-14 19:24:47 +08:00