Commit Graph

21 Commits

Author SHA1 Message Date
sw 5f42ce4c80 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
2015-09-01 15:28:03 +08:00
sw 0994ae9f07 项目讨论区回复功能 2015-09-01 15:24:37 +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
suntao ecd355df0d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/users/_course_poll.html.erb
2015-08-29 17:08:01 +08:00
suntao fc47b793ee 动态块间距调整 2015-08-29 17:06:21 +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 7c3544dfec 个人主页动态 2015-08-26 17:21:58 +08:00
cxt 2124b3c392 个人主页动态缺陷修复 2015-08-26 17:02:54 +08:00
cxt 048319ef8e 个人主页 2015-08-26 15:24:57 +08:00
cxt 4915f7977e 个人动态 2015-08-25 15:08:35 +08:00
cxt 9320cd18d3 个人动态的项目讨论动态 2015-08-25 09:50:36 +08:00
cxt 011184b537 个人主页 2015-08-21 17:26:52 +08:00