Commit Graph

22437 Commits

Author SHA1 Message Date
daiao bfd4ee86ec 一级回复与点赞功能 2017-09-28 15:28:03 +08:00
daiao e4f304d431 问吧 2017-09-26 10:06:31 +08:00
daiao 71e7725e5c 贴吧 2017-09-26 08:40:27 +08:00
daiao 61fbd6a8e8 Merge branch 'develop' into dev_daiao
Conflicts:
	app/controllers/managements_controller.rb
	app/views/managements/classroom_classment.html.erb
2017-09-25 15:17:30 +08:00
cxt 7b811d67a7 身份为学生,在成员管理中可以对教师申请进行同意或拒绝操作 2017-09-25 15:06:30 +08:00
cxt 220de355c5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-25 15:04:39 +08:00
daiao 5eaef1abe3 实训选择题 2017-09-25 14:16:45 +08:00
daiao 7c024985bf 单选多选题答题模式修改 2017-09-25 11:16:16 +08:00
cxt 5f185c0cd7 课堂作业的“挂起”改为未发布 2017-09-25 10:40:34 +08:00
daiao b7ce7e214e 学员统计报500 2017-09-25 09:34:45 +08:00
daiao 342dcb03b1 学院统计报500 2017-09-25 09:28:28 +08:00
daiao 80ee189680 TPM学员统计报500 2017-09-25 09:17:45 +08:00
daiao 539902fa79 超级管理员导出EXCEL 2017-09-25 08:56:51 +08:00
miss 5af447875e ajax加载层级调整 2017-09-24 10:34:48 +08:00
cxt 8051dd97d3 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 23:23:23 +08:00
cxt 55dd9d833e 实训合作者 2017-09-22 23:23:10 +08:00
huang 89b2c76ad2 修复403问题 2017-09-22 22:51:44 +08:00
huang 9e904736d7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 22:38:56 +08:00
huang 0da3fa675f 修复403问题 2017-09-22 22:38:39 +08:00
cxt 273a1a2207 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 22:20:05 +08:00
cxt 322588f93b 提交状态显示有误 2017-09-22 22:19:52 +08:00
huang ca2a9db56c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 22:07:52 +08:00
huang 91d1b133b3 实训提示语及编辑复制 2017-09-22 22:07:36 +08:00
XuCheng642 0cd375873e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 21:48:16 +08:00
XuCheng642 8fff505762 Merge branch 'dev_xucheng' into develop 2017-09-22 21:47:53 +08:00
XuCheng642 7097cc1527 管理员界面用户修改 2017-09-22 21:46:09 +08:00
cxt 6072b20cfd 匿名头像在火狐浏览器下打开空白页 2017-09-22 21:28:16 +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
huang 464c32a379 实训学员统计排序倒序 2017-09-22 20:54:43 +08:00
huang d9ae09bf56 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:51:11 +08:00
caishi 23de636623 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:44:05 +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
miss 25b593700f Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:35:34 +08:00
miss 60d04af7c6 问题的修改 2017-09-22 20:35:09 +08:00
huang b2bc8b8068 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:34:47 +08:00
huang 5a8578b2cf 添加已发布实训页面不能编辑代码功能 2017-09-22 20:34:30 +08:00
XuCheng642 776d9c5e66 Merge branch 'develop' into dev_xucheng 2017-09-22 20:27:47 +08:00
XuCheng642 6f17f97c4d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:26:43 +08:00
XuCheng642 1d68147b79 Merge branch 'dev_xucheng' into develop 2017-09-22 20:26:19 +08:00
XuCheng642 6a142641b6 管理员界面消息列表 2017-09-22 20:24:43 +08:00
daiao 5fcb1f18c4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:06:05 +08:00
daiao 0e253c4e9f 实训关卡得分默认值设置为100分,并迁移以往分数为空的数据 2017-09-22 20:05:48 +08:00
huang fddf4b302a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:04:49 +08:00
huang 7cc12f034d 已发布实训版本库控制权限迁移 2017-09-22 20:04:32 +08:00
huang a95cef0599 实训发布改成除了超级管理员外,其他成员不允许修改 2017-09-22 20:04:09 +08:00