Commit Graph

25 Commits

Author SHA1 Message Date
cxt 0f804a7588 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
	app/controllers/shixuns_controller.rb
	app/models/shixun.rb
2017-06-22 09:52:20 +08:00
cxt 7dee11fe66 实训的流程更改 2017-06-21 17:26:49 +08:00
huang 3efcdfc7dc 修复我参入的实训数据为空问题 2017-06-21 14:43:31 +08:00
huang e978db4233 个人主页我的实训及我参入的实训添加分页 2017-06-19 15:07:58 +08:00
daiao 91d3bc04b5 个人主页的课堂列表和实训列表底部的“点击查看全部”更换成换页 2017-06-14 10:27:49 +08:00
daiao 7e8eb7eae5 我的留言页面去掉左侧栏,把留言提上来,1200宽 2017-06-13 14:45:11 +08:00
huang e63508a337 弹框样式问题 2017-06-11 16:00:12 +08:00
huang f0823e7eb7 实名认证方式修改 2017-06-11 15:53:04 +08:00
huang d259706a19 我参入的实训修改 2017-06-09 22:08:10 +08:00
huang b05bd236cd 我的实训 2017-06-09 21:59:24 +08:00
daiao 14549426d9 我的实训 2017-06-09 21:44:44 +08:00
huang 9230e4b1c8 修改我已参入的实训 2017-06-09 20:40:57 +08:00
huang ac843971a0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-09 16:55:56 +08:00
huang 3b57616986 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/edu-class.css
2017-06-09 16:55:22 +08:00
cxt 650d8016a0 加入班级时选择身份为教师或助教,教师界面没有相关的审核(新建班级) 2017-06-09 16:51:32 +08:00
huang 809a580cca 添加我的实训功能 2017-06-09 16:17:31 +08:00
cxt 09a4b41381 发送资源中的班级数据有缺失,没有找到新建的班级 2017-06-08 09:45:28 +08:00
cxt 75b37651fa 班级资源页面的发送点击无效,应该与课程的选用按钮相类似 2017-06-06 17:20:33 +08:00
cxt 55e04d2886 作业详情页的回复 2017-05-24 10:49:33 +08:00
huang ed5e500ca1 查看他人的主页实训只能看到认证的 2017-05-23 19:23:15 +08:00
huang aa7bb35cc9 个人主页实训tab 2017-05-19 10:34:56 +08:00
huang f5ef9206b5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/taskstyle.css
2017-04-24 14:47:55 +08:00
huang 544ec0fb8f 实训首页框架 2017-04-24 14:42:54 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00