Commit Graph

8 Commits

Author SHA1 Message Date
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
2016-03-17 16:06:36 +08:00
alan 8e41b19563 消息列表取消tip 2016-03-17 15:09:08 +08:00
huang 5681d329d6 Merge branch 'develop' into hjq_new_course
Conflicts:
	app/controllers/news_controller.rb
	app/views/users/_user_message_userfeedaback.html.erb
2016-03-15 11:12:24 +08:00
luoquan 7d70e63f8d 代码重置 2016-03-11 10:18:10 +08:00
huang 627580a9ac 标签问题(未完) 2016-03-10 16:25:39 +08:00
huang c947121e2b 消息不显示问题(未完) 2016-03-10 14:52:49 +08:00
ouyangxuhua 3955075d03 消息中,将用户留言前面的空行去掉 2015-10-10 15:00:49 +08:00
huang 030f9e945e 优化消息整个界面代码 2015-09-28 16:14:53 +08:00