Commit Graph

42 Commits

Author SHA1 Message Date
Linda 0629b76705 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-24 17:36:30 +08:00
Linda 26e27b5b03 只能课堂搜索向左移动 2017-05-24 11:13:41 +08:00
Linda fdcb9d16bc 班级成员列表的搜索框文字显示不全,且输入框没有上下居中 2017-05-24 10:44:38 +08:00
cxt 7ab951327b 班级成员管理页面报500 2017-05-24 09:53:19 +08:00
huang 915930e4f8 课程配置中教师列表相关功能 2017-05-23 22:58:44 +08:00
huang b35e68c30b 静态链接 2017-05-23 22:44:12 +08:00
daiao 406026beea Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 22:27:16 +08:00
daiao 41fcb10da7 课程模块隐藏 2017-05-23 22:27:02 +08:00
huang 8f0369f75e 课程位置定位“只能课堂”链接错误 2017-05-23 22:14:38 +08:00
daiao cd04de5c1b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:32:40 +08:00
daiao d71a829d57 我的课堂 2017-05-23 20:32:29 +08:00
Linda b0526b50d9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 20:02:40 +08:00
Linda 322ff780a4 班级的位置栏和右侧tip显示需要调整 2017-05-23 19:53:22 +08:00
Linda 903a23d8e8 智能课堂首页的icon没有显示悬浮提示 2017-05-23 19:32:39 +08:00
Linda 1ac90b3d42 智能课堂首页的筛选块显示样式调整 2017-05-23 19:25:34 +08:00
huang 128d840037 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 19:05:19 +08:00
huang 6a3f9673b5 Merge branch 'dev_cxt' into develop 2017-05-23 19:04:50 +08:00
Linda f281017cec Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 17:34:25 +08:00
daiao 3fafa137b6 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 16:00:58 +08:00
daiao 522a546ec1 班级的模块设置 2017-05-23 16:00:40 +08:00
Linda 739acba3fc 班级成员列表的位置栏需要调整 2017-05-23 13:35:49 +08:00
Linda 7b32872358 班级宽度调整为1200px 2017-05-22 15:22:24 +08:00
huang 61f2f632ca Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/homework_common/index.html.erb
	app/views/layouts/base_edu.html.erb
2017-05-22 11:14:18 +08:00
Linda 006fec71a7 智能课堂的首页,请按照游戏实训优化整体效果 2017-05-19 16:04:30 +08:00
Linda 5cec15cd3b 新建班级页按照新建课程调整 2017-05-19 11:30:10 +08:00
Linda f28dd26212 课程首页边距过高样式修改 2017-05-18 17:05:35 +08:00
cxt b74570f517 Merge branch 'develop' into dev_cxt
Conflicts:
	app/views/homework_common/index.html.erb
	app/views/layouts/base_courses.html.erb
	public/stylesheets/css/edu-public.css
2017-05-18 15:44:57 +08:00
cxt 45fecb8b8d 新建作业和作业设置 2017-05-18 15:39:53 +08:00
daiao aa0ed21b8c Merge branch 'dev_daiao' into develop 2017-05-18 14:26:40 +08:00
huang 438f7ec7d8 查重页面 2017-05-18 10:18:35 +08:00
huang 4cb7979dcf 代码查重详情 2017-05-17 19:43:05 +08:00
huang f9d7ab161c 完成查重列表 2017-05-17 19:35:06 +08:00
Linda 060fcccc60 班级设置筛选斜体修改 2017-05-17 13:51:28 +08:00
Linda de42b13240 班级设置成员列表改为table格式 2017-05-17 11:46:42 +08:00
daiao c5427f519b 实训样式调整 2017-05-16 16:42:21 +08:00
Linda d0b827019a 班级设置界面美化 2017-05-16 10:39:37 +08:00
daiao f6c760c1cb 智慧课堂首页 2017-05-15 16:59:26 +08:00
daiao 048a16927e Merge branch 'develop' into dev_daiao 2017-05-15 09:13:35 +08:00
daiao 5d1afccb7e 智慧课堂(未完) 2017-05-14 11:21:42 +08:00
cxt 0e868b45d7 班级新建和设置(除模块设置) 2017-05-13 22:23:53 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00