Commit Graph

80 Commits

Author SHA1 Message Date
Tim 3d5f93b938 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_project_issue.html.erb
	app/views/users/_project_message.html.erb
	app/views/users/_user_activities.html.erb
	public/stylesheets/new_user.css
2015-09-16 16:13:40 +08:00
cxt a184ab4b69 个人动态首页只显示第一个动态的回复框,其它的需点击才显示 2015-09-16 15:40:05 +08:00
Tim 77a8c18a77 1.关于我们样式修改;
2.登录界面格式调整;
3.个人动态回复样式调整;
2015-09-16 10:16:25 +08:00
cxt a999897efa 动态回复头像的调整 2015-09-15 09:22:18 +08:00
lizanle 17b4b31449 隐藏个人中心的回复 textarea编辑框 2015-09-11 14:44:50 +08:00
cxt d274b675db 去掉动态中的“缺陷描述”、“通知描述”等文字 2015-09-06 10:07:18 +08:00
huang 02ace5693f 去掉项目多余的横线 2015-09-03 16:02:58 +08:00
cxt 69cba79926 修改动态的显示时间 2015-09-02 18:18:08 +08:00
suntao 1fff00bab0 回复模块改动 2015-09-02 17:41:19 +08:00
sw bbf4478fc0 课程通知回复后不能及时刷新页面 2015-09-02 11:45:52 +08:00
suntao 7276b5685e 表情框按钮间距调整 2015-09-01 17:31:44 +08:00
cxt 21565b74fe 冲突 2015-09-01 16:37:43 +08:00
suntao fe664b5e5c 回复模块调整 2015-09-01 09:42:03 +08:00
cxt fa57a6c889 主页动态的样式修改 2015-08-31 15:33:20 +08:00
cxt 7d6f952737 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:12:55 +08:00
cxt 118b731dc4 点击动态链接进入相关列表 2015-08-31 15:12:46 +08:00
suntao b0ff7f0ee2 页面间距调整,头像大小调整 2015-08-31 14:52:56 +08:00
cxt a7f161804e 描述和回复超出边框 2015-08-29 16:59:13 +08:00
cxt b30a07d651 个人主页动态 2015-08-29 14:27:16 +08:00
cxt c650c83f82 个人主页报500、动态显示错位的bug修复 2015-08-29 10:16:04 +08:00
cxt 69178f1522 个人主页 2015-08-28 17:46:21 +08:00
cxt e448d2c05f 个人主页 2015-08-28 17:25:42 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +08:00
cxt 2124b3c392 个人主页动态缺陷修复 2015-08-26 17:02:54 +08:00
cxt 048319ef8e 个人主页 2015-08-26 15:24:57 +08:00
sw e2af9e26f8 个人主页报错 2015-08-25 15:35:45 +08:00
cxt 9320cd18d3 个人动态的项目讨论动态 2015-08-25 09:50:36 +08:00
cxt 51c2f595d1 个人主页动态 2015-08-24 17:45:09 +08:00
cxt 011184b537 个人主页 2015-08-21 17:26:52 +08:00
cxt e1fb2a6bab 个人主页动态 2015-08-21 16:07:18 +08:00