Commit Graph

5 Commits

Author SHA1 Message Date
cxt c46fcc48b1 Merge branch 'develop' into cxt_course
Conflicts:
	app/views/users/_join_course_course_message.html.erb
2016-07-12 16:26:13 +08:00
cxt f0e456729e 过滤掉消息中的html 2016-07-12 16:21:30 +08:00
huang 0a001b4f76 message 500 for boliang 2016-07-11 11:29:15 +08:00
cxt 9caf9cbf2f 消息列表的消息,在点击时,要弹出新的浏览器页面 2016-05-16 16:16:24 +08:00
cxt ac5a9c87ac 消息通知中的“同意|拒绝”调整宽度 2016-05-12 14:59:12 +08:00