ouyangxuhua d820977d5d Merge branch 'develop' into ouyang ... Conflicts: app/views/blog_comments/show.html.erb app/views/courses/syllabus.html.erb app/views/messages/_org_subfield_show.html.erb		2016-02-02 15:51:18 +08:00
..
_course_form.html.erb	KE引用统一使用import_ke	2015-12-06 15:03:36 +08:00
_course_news.html.erb	课程通知改成动态的模式	2015-12-24 09:57:32 +08:00
_course_news_detail.html.erb	kindeditor回复框修改	2016-02-01 14:50:45 +08:00
_course_news_list.html.erb	课程通知增加置顶	2015-11-12 16:52:42 +08:00
_course_news_new.html.erb	课程通知改成动态的模式	2015-12-24 09:57:32 +08:00
_course_show.html.erb	点击详情页面文本格式调整	2016-02-02 11:23:17 +08:00
_edit_for_org_subfield.html.erb	组织栏目的通知增加查、改、删功能	2016-01-20 17:23:02 +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
_organization_show.html.erb	点击详情页面文本格式调整	2016-02-02 11:23:17 +08:00
_project_form.html.erb	merge	2015-12-14 17:26:40 +08:00
_project_news.html.erb	修改几个bug	2016-01-21 16:57:13 +08:00
_project_news_detail.html.erb	kindeditor回复框修改	2016-02-01 14:50:45 +08:00
_project_news_new.html.erb	修改几个bug	2016-01-21 16:57:13 +08:00
_project_show.html.erb	点击详情页面文本格式调整	2016-02-02 11:23:17 +08:00
edit.html.erb	修改几个bug	2016-01-21 16:57:13 +08:00
index.api.rsb	first commit	2013-08-01 10:33:49 +08:00
index.html.erb	将分享的js方法统一，分享文件、通知等均可复用	2016-01-21 14:33:31 +08:00
index.js.erb	将分享的js方法统一，分享文件、通知等均可复用	2016-01-21 14:33:31 +08:00
new.html.erb	去掉代码审查	2015-04-13 23:39:56 +08:00
show.html.erb	组织栏目的通知增加查、改、删功能	2016-01-20 17:23:02 +08:00