 daiao
|
22d7e92d4c
|
班级模块功能修复
|
2017-05-27 14:55:06 +08:00 |
|
daiao
|
075afa0d9f
|
平台首页的实训项目块请与项目实训的首页保持一致
|
2017-05-27 14:41:37 +08:00 |
 huang
|
ec37be7f1a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-27 14:35:13 +08:00 |
|
daiao
|
fcee8e2261
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-27 14:29:38 +08:00 |
|
daiao
|
381996227b
|
个人主页样式调整
|
2017-05-27 14:29:22 +08:00 |
 Linda
|
730a1aebea
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/courses/settings/_no_group_student_list.html.erb
|
2017-05-27 14:27:22 +08:00 |
|
huang
|
d935388689
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-27 14:21:56 +08:00 |
|
huang
|
ed365cf796
|
添加实训语言及LOGO；实训认证底层框架
|
2017-05-27 14:21:31 +08:00 |
|
Linda
|
6e774096d5
|
班级设置成员管理页面全部重写
|
2017-05-27 14:12:13 +08:00 |
|
daiao
|
684777fa10
|
缺陷
|
2017-05-27 11:25:56 +08:00 |
|
daiao
|
3bff36094a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-27 11:08:17 +08:00 |
|
daiao
|
da610854e7
|
修改智能课堂的左侧功能条
|
2017-05-27 11:08:01 +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
|
1a4c3bc7a7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-27 10:27:28 +08:00 |
|
daiao
|
b050ebc2e8
|
班级模块整体功能完善
|
2017-05-27 10:27:11 +08:00 |
|
cxt
|
06e9e7f157
|
发布作业但是没有为每个学生创建一条空记录
|
2017-05-27 09:58:52 +08:00 |
|
Linda
|
dea93b081e
|
班级头部不需要图片，调整信息显示
|
2017-05-27 09:54:41 +08:00 |
|
Linda
|
c2dbf57680
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-26 17:29:13 +08:00 |
|
Linda
|
de7b0089ee
|
修改资料的安全设置中，icon样式和显示问题
|
2017-05-26 17:04:22 +08:00 |
|
cxt
|
c9205eb1ea
|
修改资料的安全设置中，手机绑定时对于已绑定的手机号显示样式错位
|
2017-05-26 16:15:52 +08:00 |
|
Linda
|
aaf2726651
|
资源的“删除”垃圾箱出现的太早，导致资源名称很早就被“...”了
|
2017-05-26 15:56:51 +08:00 |
|
cxt
|
8454330981
|
作业动态的齿轮菜单内容请修正
|
2017-05-26 15:46:26 +08:00 |
|
Linda
|
f6a36b03cd
|
加入班级弹框中的checkbox请换成统一样式
|
2017-05-26 15:39:36 +08:00 |
|
Linda
|
4b524679ff
|
班级设置的基本信息页也需要把图片去除
|
2017-05-26 15:09:34 +08:00 |
|
Linda
|
21266dadee
|
班级设置的checkbox“√”没有居中，而且与行信息没有对齐
|
2017-05-26 15:05:57 +08:00 |
|
cxt
|
4f7a52ef9d
|
作业动态内容区域加宽了，请多显示2个优秀作品
|
2017-05-26 14:37:26 +08:00 |
|
cxt
|
1a9c35b26f
|
请确认效果显示，默认应该是1蓝色，2灰色。审核通过后则1,2均蓝色
|
2017-05-26 14:19:06 +08:00 |
|
Linda
|
6f63321cbf
|
注册页2个tab的checkbox样式请换成统一样式
|
2017-05-26 11:26:40 +08:00 |
|
huang
|
0359c2e267
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-26 11:23:53 +08:00 |
|
huang
|
128e24711d
|
用户认证底层结构
|
2017-05-26 11:23:32 +08:00 |
|
daiao
|
77cf39eb54
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-26 11:08:29 +08:00 |
|
daiao
|
95956a5004
|
配置页面
|
2017-05-26 11:08:06 +08:00 |
|
cxt
|
1600f11444
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-26 10:35:00 +08:00 |
|
cxt
|
bf317dba48
|
班级的教师或助教点击头部的“教师”“学生”“分班”应该进入成员管理的相应页面
|
2017-05-26 10:34:25 +08:00 |
|
Linda
|
cc791c3a57
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-26 10:03:21 +08:00 |
|
Linda
|
70afa4c0b2
|
身份认证上传图片流程显示
|
2017-05-26 10:03:01 +08:00 |
|
huang
|
d3602d9251
|
重新评测最后一关通过的时候显示通过所有关
|
2017-05-26 09:48:06 +08:00 |
|
Linda
|
a22313b51a
|
请优化“我的课堂”页面显示
|
2017-05-26 09:38:27 +08:00 |
|
cxt
|
cf05073a94
|
作品编辑页的附件显示位置有错位
|
2017-05-26 09:36:53 +08:00 |
|
cxt
|
5bf0edd8f5
|
加入分班的按钮
|
2017-05-26 09:30:32 +08:00 |
|
huang
|
78a67570c7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-25 17:41:43 +08:00 |
|
huang
|
909255876e
|
game下一关加积分问题
|
2017-05-25 17:41:28 +08:00 |
|
daiao
|
441629b13f
|
隐藏班级模块
|
2017-05-25 17:40:44 +08:00 |
|
daiao
|
cf3f068fc3
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-25 17:36:15 +08:00 |
|
daiao
|
22d4ea6478
|
样式调整
|
2017-05-25 17:35:59 +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
|
2bd02cca50
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-25 17:20:38 +08:00 |
|
Linda
|
93f4f3b3c7
|
项目实训 首页的显示调整
|
2017-05-25 16:59:49 +08:00 |
|
daiao
|
2a9125bf97
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-25 16:58:22 +08:00 |