Commit Graph

10 Commits

Author SHA1 Message Date
daiao 0591440c9e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_user_message_forge.html.erb
	db/schema.rb
2017-01-13 11:28:33 +08:00
huang be531d6abd 个人主页的一些优化 2017-01-13 11:13:22 +08:00
huang 4be495a7b0 系统消息查询/显示优化(减150ms) 2017-01-12 17:14:52 +08:00
huang d5a0133b0b 个人主页部分优化 2017-01-12 16:19:11 +08:00
daiao 13e17dd5a3 博客回复,加入消息提醒 2017-01-11 17:32:04 +08:00
cxt 346dc069ef 加入竞赛的消息通知 2016-12-22 16:02:36 +08:00
daiao 73747a81d6 个人主页消息铃铛翻页 2016-12-17 15:34:26 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
daiao 69d9228808 个人主页的消息页面 2016-12-07 15:13:51 +08:00
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00