Commit Graph

69 Commits

Author SHA1 Message Date
miss e3b64c1e26 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
#	public/stylesheets/css/ketang.css
#	public/stylesheets/css/taskstyle.css
2017-09-22 17:17:51 +08:00
miss 76a3026f97 step3学员统计板块,二次回复的提示,作品页样式的调整,实训tpm配置页面上边线没有阴影。我的关注以及我的粉丝页面样式及tip问题,编辑作业给出的错误提示框无法关闭的问题,新建作业时显示的下拉列表的文字错乱问题,我的题库详情页面的菜单按钮的位置调整,班级所有页面的阴影背景色的修改。个人主页,实训,课程的tab的统一,班级成员管理的tip出现条件以及出现位置的修改 2017-09-22 14:47:53 +08:00
caishi 219ff96ea0 增加在线课堂的教师或者助教待审批提醒,且更换样式 2017-09-21 18:29:07 +08:00
caishi e138c204e0 分班 2017-09-15 17:08:16 +08:00
caishi e654e8107f 分班页面 2017-09-13 16:00:47 +08:00
caishi eb6844e293 Merge branch 'develop' into dev_cs
Conflicts:
	app/views/challenges/edit.html.erb
	app/views/homework_common/_show_score_setting.html.erb
	app/views/homework_common/setting.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_edu.html.erb
	app/views/layouts/base_edu_course.html.erb
	app/views/shixuns/_send_shixuns.html.erb
	app/views/shixuns/_shixun_top.html.erb
	public/stylesheets/css/edu-common.css
2017-09-08 16:48:11 +08:00
caishi 359e041186 课堂动态和作业列表样式更新 2017-09-07 14:18:48 +08:00
cxt e30cbff41c 在新建课堂页面,输入号课程名称和课堂名称后,点击一下课程名称输入框,课堂名称的后缀就会消失 2017-09-07 10:25:32 +08:00
caishi 7531bbe7b7 课程设置页面样式修改 2017-09-06 09:40:23 +08:00
cxt 134cedf3d2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 17:02:19 +08:00
caishi a707672ac2 Merge branch 'develop' into dev_cs 2017-09-05 16:39:55 +08:00
caishi 06cced2013 课堂的部分样式修改 2017-09-05 16:39:43 +08:00
cxt ef3c4f1d51 简化统一实训和课堂的专业及课程名称 2017-09-05 11:03:49 +08:00
caishi e7c3bb3457 课程基本信息 2017-09-05 10:58:50 +08:00
caishi e5ce4c502a 周末提出的样式问题修改 2017-09-03 16:18:27 +08:00
cxt 43eafaf095 新建课堂修删除专业等信息,简洁化 2017-08-29 17:31:28 +08:00
caishi 325f3f536f 作业列表右上角下拉菜单字体 2017-08-27 11:06:47 +08:00
caishi b0dbc2dce8 镜像管理页、以及部分Issues的修改 2017-08-16 11:22:40 +08:00
caishi 49d5d648c3 在线课堂的首页加入课堂和新建入口的间隔调整
课程页面显示效果调整存在缺陷
2017-08-15 09:20:46 +08:00
cxt 8aac673a10 Merge branch 'dev_cxt' into dev_cs
Conflicts:
	public/stylesheets/css/edu-class.css
2017-08-10 16:10:59 +08:00
caishi 1b6a9d1bd5 添加最小高度 2017-08-10 16:08:50 +08:00
cxt 2f8b5a8a0f 课程页面的改版调整 2017-08-10 11:29:37 +08:00
caishi 4a217fd38a 班级、课程页面改版 2017-08-10 09:21:48 +08:00
caishi 389e76dcd7 issue修改 2017-07-31 17:09:58 +08:00
cxt 78a555828b 成员列表的样式调整为table 2017-07-25 11:21:35 +08:00
caishi 1cf8d27f78 修改Issues 2017-07-18 17:20:06 +08:00
caishi d53a607157 TPI添加评论Tab 2017-07-18 08:45:33 +08:00
cxt 460f1b52d3 课程的大纲、资源、题库和教师团队不需要纵向滚动条 2017-07-14 15:02:22 +08:00
Linda c6b18f2eb6 修改作品列表页面鼠标悬浮tip位置 2017-07-04 09:59:49 +08:00
cxt bfb0ed6473 分组作业提交作业页面样式问题 2017-06-30 15:36:07 +08:00
daiao 289ff1a329 Merge branch 'dev_daiao' into develop
Conflicts:
	app/views/users/_my_homepage_shixuns_list.html.erb
2017-06-30 09:54:09 +08:00
cxt 5508cedb45 实训作业 2017-06-28 15:23:09 +08:00
daiao 236662ce18 我的课堂的效果与静态页面的显示有出入 2017-06-26 14:51:56 +08:00
cxt 0aaf478ed2 课程资源库和题库的权限调整 2017-06-19 17:11:10 +08:00
cxt d1637b3cde 个人主页的tab样式与“我的实训”保持一致 2017-06-16 19:07:31 +08:00
cxt 1aa0ce78c3 新版题库 2017-06-16 15:18:41 +08:00
cxt cb12147d11 作品补交、补交附件 2017-06-14 09:25:09 +08:00
cxt 24364118af tab的样式调整 2017-06-12 11:04:12 +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
huang 809a580cca 添加我的实训功能 2017-06-09 16:17:31 +08:00
cxt 1f04cd1285 作品评分 2017-06-08 17:39:29 +08:00
huang d888e3f140 热证一些修改 2017-06-08 11:17:29 +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
Linda 21266dadee 班级设置的checkbox“√”没有居中,而且与行信息没有对齐 2017-05-26 15:05:57 +08:00
cxt 5bf0edd8f5 加入分班的按钮 2017-05-26 09:30:32 +08:00
Linda 5ce5aa2825 班级的模块设置 2017-05-25 15:16:59 +08:00
Linda 7e9b21a472 个人主页的课堂和实训列表的分享隐藏 2017-05-25 10:40:21 +08:00
Linda 8ccc75421d 课程的“分享”隐藏 2017-05-25 10:24:55 +08:00
huang 128d840037 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 19:05:19 +08:00
Linda 3d643550e5 课程的图片“更换图片”应该是鼠标悬浮样式,而不是始终显示 2017-05-23 16:15:49 +08:00