alanlong9278 336b59f606 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh ... Conflicts: .gitignore Gemfile app/views/issues/index.html.erb app/views/layouts/_base_feedback.html.erb app/views/tags/_tag_name.html.erb Signed-off-by: alanlong9278 <547533434@qq.com>		2015-05-08 09:15:50 +08:00
..
_course_list.html.erb	#2452course网站课程资源个数的显示和主页显示的不一致	2015-05-06 15:05:57 +08:00
_hot_projects_list.html.erb	Signed-off-by: alanlong9278 <547533434@qq.com>	2015-04-15 12:30:37 +08:00
_link_to_another.html.erb	完成个人信息下拉、首页下标的隐藏非项目信息的定制	2015-04-09 11:00:39 +08:00
_more_course.html.erb	课程主页新建课程按钮，修改为所有人都可以看到	2014-11-22 15:35:28 +08:00
_no_course_title.html.erb	企业版模块	2015-01-30 14:11:35 +08:00
_search_bar.html.erb	完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签	2015-03-10 09:45:36 +08:00
_search_course.html.erb	国际化结构调整	2015-02-09 22:07:21 +08:00
_search_project.html.erb	附件上传国际化调整	2015-04-10 17:58:59 +08:00
_wei_xin.html.erb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
contest.html.erb	竞赛主页竞赛通知条数对主页样式的调整	2015-04-24 17:11:36 +08:00
course.html.erb	竞赛主页竞赛通知条数对主页样式的调整	2015-04-24 17:11:36 +08:00
index.html.erb	项目界面国际化及样式调整；标签模块国际化及样式调整	2015-04-10 12:48:02 +08:00
robots.html.erb	fix robots rule	2014-04-19 10:04:55 +08:00