z9hang 3d860af48b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/welcome/contest.html.erb app/views/welcome/index.html.erb public/javascripts/attachments.js		2014-10-23 14:42:26 +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	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-10-23 14:42:26 +08:00
plugin_assets	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
statistics/trustie2	move 2013.8.29	2013-08-30 09:34:21 +08:00
stylesheets	1、空数据库情况下3个主页布局修改。2、上传附件成功提交后公开自动变成私有的bug	2014-10-23 14:36:10 +08:00
themes	项目列表--项目描述显示不全	2014-10-15 15:13:26 +08:00
404.html	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +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	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00
htaccess.fcgi.example	first commit	2013-08-01 10:33:49 +08:00
no_file_found.html	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00