sw b49e76bf79 Merge branch 'xiaoguang-contest' into szzh ... Conflicts: app/views/softapplications/show.html.erb app/views/welcome/contest.html.erb		2014-09-02 09:28:51 +08:00
..
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-07-15 16:16:13 +08:00
javascripts	日期选择器不能用问题	2014-08-23 10:58:07 +08:00
plugin_assets	修复CKEditor插件显示不正确的问题	2014-07-24 14:03:43 +08:00
statistics/trustie2	move 2013.8.29	2013-08-30 09:34:21 +08:00
stylesheets	Merge branch 'xiaoguang-contest' into szzh	2014-09-02 09:28:51 +08:00
themes	admin页面中问题追踪项相关错误（课程、项目分离此处代码未改导致的问题）、项目列表中项目提交次数改为从数据库中读取（运行bundle exec rake project_score:calculate统计项目提交次数）	2014-08-26 16:07:17 +08:00
404.html	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
500.html	new version	2013-09-12 10:41:15 +08:00
dispatch.fcgi.example	first commit	2013-08-01 10:33:49 +08:00
favicon.ico	first commit	2013-08-01 10:33:49 +08:00
favicon.old.ico	first commit	2013-08-01 10:33:49 +08:00
file_not_found.html	添加文件提示页面元素变量处理	2014-08-14 11:09:34 +08:00
file_not_found.html.erb	添加文件提示页面元素变量处理	2014-08-14 11:09:34 +08:00
htaccess.fcgi.example	first commit	2013-08-01 10:33:49 +08:00