Commit Graph

46 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 7ae8f91446 新建作业的页面样式有点问题 2017-05-24 15:41:55 +08:00
Linda b2db96bf34 主页的实训列表icon请与课堂保持一致 2017-05-24 11:02:49 +08:00
cxt b92d4d16ba 作业详情页回复的展开更多 2017-05-24 11:00:21 +08:00
cxt 55e04d2886 作业详情页的回复 2017-05-24 10:49:33 +08:00
cxt 49ca398d67 Merge branch 'dev_cxt' into develop 2017-05-23 22:56:23 +08:00
cxt 599869f970 作业的回复 2017-05-23 22:55:20 +08:00
huang 81294a0616 个人首页课程、实训超过8个点击跳至相应社区页 2017-05-23 20:06:24 +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 32088f23a4 主页的实训列表icon请与课堂保持一致 2017-05-23 17:10:35 +08:00
cxt 1e8a36a8d2 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/student_work/show.html.erb
2017-05-23 15:32:16 +08:00
cxt 935922b365 普通、编程、分组作业的提交和编辑 2017-05-23 15:18:53 +08:00
Linda bdea0c45bc 作业、通知、留言动态的小齿轮及其菜单样式请替换成最新样式">作业、通知、留言动态的小齿轮及其菜单样式请替换成最新样式 2017-05-23 14:33:25 +08:00
huang d76bbb372b 个人主页添加实训链接 2017-05-22 16:34:18 +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
huang d35809b59f 解决个人主页实训数据不一致问题 2017-05-21 15:56:14 +08:00
huang b3b74b75c9 我的实训列表问题,实训内容显示问题 2017-05-21 15:26:43 +08:00
daiao 0f488e82e0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:45:21 +08:00
daiao 9c801959fb 我的主页课堂列表与课程页列表添加切换列表事件 2017-05-19 16:44:57 +08:00
Linda a0d76041cd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:04:50 +08:00
daiao 1ae51c748d 个人主页点击更换头像请跳转到基本资料的头像页 2017-05-19 15:30:16 +08:00
Linda 2f0b7cac4a 主页的快速入口为空时,右侧的下拉菜单无法使用 2017-05-19 11:15:29 +08:00
huang aa7bb35cc9 个人主页实训tab 2017-05-19 10:34:56 +08:00
Linda d9a91a2963 个人主页悬浮课堂列表时,不应该班级和课程名称同时变色 2017-05-19 10:33:27 +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 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
miss b1b061eeaa 调整样式及部分结构 2017-05-12 21:24:01 +08:00
cxt 239178e4e1 去掉个人首页的“编辑我的资料”、隐藏“博客” 2017-05-05 19:45:33 +08:00
cxt 4d98c5fc52 我的主页和TA的主页,鼠标悬浮博客块的时候,博客标题没有变色 2017-05-03 10:25:01 +08:00
cxt 0827a0fc48 TA的主页,浏览数量应该与我的主页一样弱化 2017-05-03 10:13:33 +08:00
cxt 60d33cf661 课程首页(除课程资源库和课程题库) 2017-04-28 22:53:34 +08:00
cxt c49ddaf5f7 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/users/show.html.erb
2017-04-27 15:56:17 +08:00
miss 37c9e2494a 滚动条和回到顶部按钮的修改 2017-04-26 10:15:21 +08:00
chenglong d9b675f745 页面样式的修正 2017-04-26 08:40:16 +08:00
cxt 87042cad7c 个人主页调整 2017-04-24 11:01:11 +08:00
cxt 9e7624f90a Merge branch 'dev_cxt' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/css/bigdata-common.css
2017-04-21 22:10:17 +08:00
daiao dcd496d32a 基本资料页面样式调整 2017-04-21 22:00:50 +08:00
chenglong a69a0f4f38 再次修改页面效果 2017-04-21 21:22:15 +08:00
chenglong 8e2cce8fd2 静态页面的修改 2017-04-21 20:06:54 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
Linda 19f5aaa28a ico 图标替换 2017-04-19 15:15:44 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00