whimlex 617107f0cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/welcome/index.html.erb config/locales/zh.yml		2015-01-30 10:34:47 +08:00
..
_course_list.html.erb	课程主页，如课程资料数为0，则取消显示	2014-11-27 15:39:57 +08:00
_link_to_another.html.erb	IE浏览器中：课程，竞赛，托管平台的主页不能正常显示	2015-01-07 17:28:45 +08:00
_more_course.html.erb	课程主页新建课程按钮，修改为所有人都可以看到	2014-11-22 15:35:28 +08:00
_no_course_title.html.erb	优化课程首页效率	2014-08-11 14:49:58 +08:00
_search_bar.html.erb	#1279 修改搜索提示	2014-08-13 16:55:42 +08:00
_search_course.html.erb	首页国际化	2015-01-30 10:26:26 +08:00
_search_project.html.erb	首页国际化	2015-01-30 10:26:26 +08:00
_wei_xin.html.erb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
contest.html.erb	首页国际化	2015-01-30 10:26:26 +08:00
course.html.erb	修改空数据时，课程首页无法加载(居然是死循环。。。)	2015-01-21 09:18:29 +08:00
index.html.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-30 10:34:47 +08:00
robots.html.erb	fix robots rule	2014-04-19 10:04:55 +08:00