Tim 4dddbe9dc7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/users/_course_journalsformessage.html.erb		2015-10-16 10:58:28 +08:00
..
_attachments_links.html.erb	文件名称尽可能的显示完全	2015-09-28 14:35:55 +08:00
_form.html.erb	添加<公共贴吧 无帖子置顶功能 建议增加>，<管理员可以根据贴吧的热度选择将贴吧置顶>	2014-11-03 15:16:56 +08:00
_praise_tread.html.erb	帮助中心报500的问题	2015-09-29 17:16:53 +08:00
_reply_box.html.erb	修改公共贴吧样式	2015-04-23 11:56:59 +08:00
_topic_form.html.erb	公共贴吧、课程、项目相关界面导航栏和底部导航栏修改	2015-08-25 15:09:02 +08:00
edit.html.erb	取消掉贴吧字符长度的限制	2015-10-13 17:03:40 +08:00
new.html.erb	修改粘图的加载方式	2015-06-17 17:01:03 +08:00
quote.js.erb	公共贴吧引用上传图片异常	2015-05-23 16:50:28 +08:00
show.html.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-10-16 10:58:28 +08:00