alan 85b9134f0f Merge branch 'guange_dev' into redis_cache ... Conflicts: app/views/courses/_courses_jours.html.erb app/views/courses/show.html.erb Signed-off-by: alan <547533434@qq.com>		2015-06-18 11:18:32 +08:00
..
_course_form.html.erb	修改粘图的加载方式	2015-06-17 17:01:03 +08:00
_course_news.html.erb	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache	2015-06-11 18:00:45 +08:00
_course_show.html.erb	修改粘图的加载方式	2015-06-17 17:01:03 +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-06-17 17:01:03 +08:00
_project_news.html.erb	项目新闻添加编辑器：显示页面、列表页面新样式显示	2015-05-27 14:45:36 +08:00
_project_show.html.erb	编辑器（未改动）	2015-06-15 10:34:23 +08:00
edit.html.erb	修改粘图的加载方式	2015-06-17 17:01:03 +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