Commit Graph

429 Commits

Author SHA1 Message Date
sw 711b21070f 上传附件样式调整 2015-08-28 11:53:05 +08:00
sw 2fa03c3102 导入作业功能完成 2015-08-28 11:32:57 +08:00
lizanle f9651d853c 资源每页显示的个数 2015-08-28 10:47:50 +08:00
sw 007a39b5d5 作业列表的过滤查询 2015-08-28 10:00:48 +08:00
lizanle d3f441d4da 可拖动的资源弹出框 2015-08-28 09:34:02 +08:00
sw c5ad5a3a5a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-27 17:35:04 +08:00
lizanle 149ac07cf9 去掉重复的css,
解决之前在页面其他地方点击链接,导致链接背景色变白色的bug
2015-08-27 16:20:47 +08:00
sw cb5abc6d74 导入作业弹框 2015-08-27 16:03:41 +08:00
sw 1f87c4adf5 重复CSS删除 2015-08-27 09:46:17 +08:00
lizanle 41a8f9d6a2 底部去掉marginBottom:10px
登录界面加底部
2015-08-27 09:28:13 +08:00
lizanle 82b86ea14f Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 17:52:32 +08:00
lizanle 733876743e 服务协议 忘记密码 2015-08-26 17:52:23 +08:00
sw b7cbb9b0c2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css
2015-08-26 17:31:37 +08:00
sw 049e27f15f 发布作业功能 2015-08-26 17:29:47 +08:00
huang a54de0c8fb Merge branch 'dev_hjq' into sw_new_course 2015-08-26 16:33:21 +08:00
lizanle ccfd69602c 服务协议 2015-08-26 16:31:28 +08:00
huang b824c3fa46 1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
2015-08-26 16:31:28 +08:00
huang 6a986b98d9 Merge branch 'sw_new_course' into dev_hjq
Conflicts:
	app/controllers/users_controller.rb
2015-08-26 16:14:50 +08:00
lizanle 5ec24913bb 留言背景色 留言头 2015-08-26 16:06:15 +08:00
sw e2869faa08 日历选择器的样式调整 2015-08-26 15:17:56 +08:00
huang 334e6dbd55 消息未读样式 2015-08-26 15:14:25 +08:00
sw 686af68026 关注、粉丝、编辑资料页面样式问题 2015-08-26 14:11:28 +08:00
sw f0a4d364b0 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 13:56:53 +08:00
sw ccfa93be66 老师布置作业界面 2015-08-26 13:56:37 +08:00
lizanle d735eee4a3 关注和取消关注 2015-08-26 11:41:32 +08:00
cxt cccc0577c7 个人动态 2015-08-26 08:51:39 +08:00
sw 767fc67686 已过期课程显示为darkgrey 2015-08-25 18:22:46 +08:00
sw c8b1bb5d64 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 15:09:21 +08:00
sw bcd12e7e48 课程、项目相关页面 顶部导航栏和底部导航栏修改 2015-08-25 14:09:37 +08:00