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

54 Commits

Author SHA1 Message Date
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
cxt 8a6e2ac0f0 在线课堂的全部课堂数量包含归档的 2017-09-08 21:44:46 +08:00
cxt 90d4a9034a 分班成绩导出报500 2017-09-08 15:06:54 +08:00
cxt 5678fbfccb 在线课堂首页筛选修改 2017-09-06 16:08:56 +08:00
daiao 888bd440e2 上线缺陷修复 2017-09-01 19:21:00 +08:00
cxt a087cc809a Merge branch 'dev_cxt' into develop 
Conflicts:
	app/views/courses/index.html.erb
	app/views/courses/index.js.erb
	app/views/subjects/_subject_list.html.erb
	app/views/subjects/show.html.erb
 2017-09-01 15:06:18 +08:00
cxt 43eafaf095 新建课堂修删除专业等信息，简洁化 2017-08-29 17:31:28 +08:00
daiao 752e9799f4 全部实训和在线课堂的搜索icon点开之后显示不一致 2017-08-29 14:16:28 +08:00
XuCheng642 8f74cc4b42 iuuue 2017-08-29 09:08:15 +08:00
cxt f82b8f0e20 班级讨论区的上线 2017-07-28 16:59:17 +08:00
cxt 293997b2da 班级添加学生 2017-07-21 20:00:12 +08:00
daiao 7c02bad6ca 查看归档点击后，显示的是归档课程，所以头部的“全部课堂”“我的课堂”最好也联动更新，使整个页面的数据和显示保持一致。返回后恢复 2017-07-21 14:27:54 +08:00
daiao 06f73b6c82 Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/courses/index.html.erb
	app/views/shixuns/_form.html.erb
 2017-07-21 10:00:45 +08:00
daiao 65331b99f5 课程实训首页的“查看归档”功能 2017-07-17 16:14:09 +08:00
cxt f110f7b7b5 班级设置页面添加学生点击搜索按钮无数据显示 2017-07-17 15:29:24 +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 ffbe5af7f1 在title搜索框中搜索实训出来的数据会影响全部实训的数据显示 2017-07-06 09:11:43 +08:00
cxt 550b516799 在班级学生成员列表页面点击导出成绩，跳转500 2017-07-04 15:26:10 +08:00
cxt 8b965bbfc3 班级设置修改后点击保存需要给出提示框 2017-07-03 11:25:18 +08:00
cxt 51c562f596 去掉课堂教学中已删除的班级 2017-06-30 19:55:31 +08:00
cxt 22a5d80e41 课堂教学首页的排序按成员数量排序 2017-06-30 19:18:03 +08:00
cxt ab4a8136c4 课堂首页的排序 2017-06-30 19:10:49 +08:00
daiao 48ec5c6f81 “课堂教学”首页的显示更新 2017-06-30 14:39:56 +08:00
cxt 621b2023f5 隐藏班级动态中未实现的部分 2017-06-23 16:24:06 +08:00
huang 8f40d7022a 修复登录等问题 2017-06-11 15:45:54 +08:00
cxt 650d8016a0 加入班级时选择身份为教师或助教，教师界面没有相关的审核（新建班级） 2017-06-09 16:51:32 +08:00
daiao 82cb879706 智能课堂的筛选样式更换 2017-06-07 16:13:46 +08:00
daiao f6da468f26 智能课堂首页的调整 2017-06-02 19:22:29 +08:00
huang 8753652421 只能课堂添加统计及头部与实训一致 2017-06-02 16:10:30 +08:00
cxt dfb8e6f576 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/courses/settings.html.erb
 2017-05-27 10:32:17 +08:00
daiao b050ebc2e8 班级模块整体功能完善 2017-05-27 10:27:11 +08:00
daiao 95956a5004 配置页面 2017-05-26 11:08:06 +08:00
cxt bf317dba48 班级的教师或助教点击头部的“教师”“学生”“分班”应该进入成员管理的相应页面 2017-05-26 10:34:25 +08:00
daiao 441629b13f 隐藏班级模块 2017-05-25 17:40:44 +08:00
cxt 96db0b75f9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/account/user_join.html.erb
	app/views/layouts/base_edu_course.html.erb
 2017-05-25 17:34:51 +08:00
cxt 97f5abe976 成员管理 2017-05-25 17:26:46 +08:00
Linda 5ce5aa2825 班级的模块设置 2017-05-25 15:16:59 +08:00
daiao 406026beea Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 22:27:16 +08:00
daiao 41fcb10da7 课程模块隐藏 2017-05-23 22:27:02 +08:00
huang 8f0369f75e 课程位置定位“只能课堂”链接错误 2017-05-23 22:14:38 +08:00
daiao 522a546ec1 班级的模块设置 2017-05-23 16:00:40 +08:00
daiao aa0ed21b8c Merge branch 'dev_daiao' into develop 2017-05-18 14:26:40 +08:00
huang 438f7ec7d8 查重页面 2017-05-18 10:18:35 +08:00
huang 4cb7979dcf 代码查重详情 2017-05-17 19:43:05 +08:00
huang f9d7ab161c 完成查重列表 2017-05-17 19:35:06 +08:00
daiao fcc269150b 智慧课堂首页 2017-05-15 17:24:46 +08:00
daiao f6c760c1cb 智慧课堂首页 2017-05-15 16:59:26 +08:00
daiao 048a16927e Merge branch 'develop' into dev_daiao 2017-05-15 09:13:35 +08:00
daiao 5d1afccb7e 智慧课堂（未完） 2017-05-14 11:21:42 +08:00