guange bb506b2ab4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... # Conflicts: # db/schema.rb		2015-05-13 16:22:44 +08:00
..
_course_form.html.erb	提交通知连接	2015-05-11 16:06:40 +08:00
_course_news.html.erb	将课程通知中的附件提到列表和动态中	2015-05-13 15:33:35 +08:00
_course_show.html.erb	课程通知、课程留言取消按钮删除编辑器内内容	2015-05-06 14:53:25 +08:00
_form.html.erb	项目界面缺失翻译调整	2015-04-10 16:59:45 +08:00
_news.html.erb	1.修改页面描述错误	2014-08-20 15:51:35 +08:00
_project_form.html.erb	新版项目界面（部分未完成，先合并）	2015-04-07 12:48:47 +08:00
_project_news.html.erb	新闻换行处理	2015-04-17 08:43:58 +08:00
_project_show.html.erb	Merge branch 'szzh' into dev_hjq	2015-04-16 10:26:03 +08:00
edit.html.erb	课程通知评论编辑框不可用，解决方案：编辑跳转到新的页面	2015-04-28 10:31:55 +08:00
index.api.rsb	first commit	2013-08-01 10:33:49 +08:00
index.html.erb	1.迁移课程新闻数据	2014-06-11 16:46:13 +08:00
new.html.erb	去掉代码审查	2015-04-13 23:39:56 +08:00
show.html.erb	修改课程通知show方法，并添加独立视图	2014-06-18 16:29:29 +08:00