Commit Graph

19942 Commits

Author SHA1 Message Date
Linda 7740459eff 项目实训的“所有状态”和“所有进展”以及搜索,请调整 2017-05-31 14:09:43 +08:00
Linda af1320a6e8 列表最后一行的横线不应该紧贴底边框,应该有一个间距 2017-05-31 09:28:51 +08:00
Linda 935f5ff552 yanse 2017-05-27 19:18:25 +08:00
Linda fff7fb5a2e logo颜色 2017-05-27 19:14:11 +08:00
Linda 4cfa90cd55 logo颜色调整 2017-05-27 19:12:20 +08:00
Linda c233f5cf9a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 18:31:43 +08:00
Linda 49b61f562d 平台图标更换,提示圆圈样式修改 2017-05-27 18:31:24 +08:00
cxt e413bd85a3 未分班列表无法加入分班 2017-05-27 17:51:04 +08:00
cxt 10218c756d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 17:39:33 +08:00
cxt 722a7e5719 班级成员管理 2017-05-27 17:39:18 +08:00
daiao 11cfc3a9ca Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 17:28:57 +08:00
daiao 5a2eccfccf 样式调整 2017-05-27 17:28:43 +08:00
huang 7473b5a9e6 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 17:11:03 +08:00
huang f92a604ee7 用户协议内容及样式修正 2017-05-27 17:10:36 +08:00
Linda 52fd97db0f Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 16:49:46 +08:00
daiao 0d29448be7 我的课程完整版 2017-05-27 16:49:45 +08:00
Linda 596a021980 noting 2017-05-27 16:49:25 +08:00
huang 3cb91f1747 服务条款下面增加下划线 2017-05-27 16:47:22 +08:00
Linda 37cfa528ee 班级动态的边框去除 2017-05-27 15:51:00 +08:00
cxt 35888f091b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 15:50:23 +08:00
cxt 11b5e6f5aa 作业列表的筛选结果不对 2017-05-27 15:50:01 +08:00
Linda 1532def22b 请微调统一提示弹框的间距 2017-05-27 15:45:57 +08:00
Linda a258ce4e76 班级作业列表的标签和菜单icon没有居中 2017-05-27 15:42:02 +08:00
Linda 91c32e16aa 头部底部LOGO替换 2017-05-27 15:34:24 +08:00
Linda dae8a808f2 课程的头部不要图片,请调整显示 2017-05-27 15:06:03 +08:00
Linda 809025f566 班级作业的搜索框内icon没有上下居中 2017-05-27 14:58:11 +08:00
Linda ed7a9ac9a0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 14:55:16 +08:00
daiao 22d7e92d4c 班级模块功能修复 2017-05-27 14:55:06 +08:00
Linda 4591cf828b logo修改 2017-05-27 14:52:47 +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
cxt 2584ec4de4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 11:26:06 +08:00
daiao 684777fa10 缺陷 2017-05-27 11:25:56 +08:00
cxt 8d0bb43e9c 修改密码页原始密码的验证有错 2017-05-27 11:15:06 +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