Commit Graph

2981 Commits

Author SHA1 Message Date
daiao cb13f6d360 Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao 2017-09-30 19:24:20 +08:00
daiao a5289610a3 实训TPI的回复 2017-09-30 19:23:38 +08:00
caishi 3e6bc1894a 论坛列表 2017-09-29 21:46:49 +08:00
caishi 7f489fddc8 问吧样式、链接修改 2017-09-29 21:15:48 +08:00
daiao 17c145a0f5 讨论评论无法局部刷新 2017-09-29 16:02:08 +08:00
daiao 5eb28b5dfa 讨论详情 2017-09-29 14:11:21 +08:00
daiao f88832796b 讨论按照置顶与非指定排序 2017-09-29 11:29:09 +08:00
daiao b023d5fbaf 顶部导航的“论坛”页面 2017-09-29 11:13:16 +08:00
daiao aa4ec780b7 讨论详情页二级回复功能 2017-09-28 17:29:36 +08:00
daiao 19a9f76a66 Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao 2017-09-28 15:28:31 +08:00
daiao bfd4ee86ec 一级回复与点赞功能 2017-09-28 15:28:03 +08:00
daiao e4f304d431 问吧 2017-09-26 10:06:31 +08:00
huang 62862ffa3b Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao
Conflicts:
	app/views/challenges/edit.html.erb
2017-09-26 10:02:15 +08:00
daiao 71e7725e5c 贴吧 2017-09-26 08:40:27 +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
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 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 6f17f97c4d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:26:43 +08:00