whimlex 0f037e78fa Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq ... Conflicts: public/stylesheets/public.css		2015-04-22 10:18:49 +08:00
..
assets/kindeditor	Merge branch 'szzh' into dev_hjq	2015-04-16 10:26:03 +08:00
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	Merge branch 'szzh' into dev_hjq	2015-04-16 10:26:03 +08:00
javascripts	Merge branch 'szzh' into dev_hjq	2015-04-22 09:31:13 +08:00
plugin_assets	在gemfile中添加rspec	2015-01-20 16:56:23 +08:00
statistics/trustie2	move 2013.8.29	2013-08-30 09:34:21 +08:00
stylesheets	Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq	2015-04-22 10:18:49 +08:00
themes	#2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐	2015-04-16 16:39:52 +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
Trustie_Beta1.0.0_201412310917.apk	for update	2015-01-04 11:53:16 +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	Signed-off-by: alan <547533434@qq.com>	2014-11-13 10:18:07 +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