z9hang 0f9915fc2a Merge branch 'szzh' into api ... Conflicts: Gemfile Gemfile.lock app/controllers/bids_controller.rb app/controllers/users_controller.rb db/schema.rb		2015-01-13 15:12:05 +08:00
..
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	用户反馈弹框模块！	2015-01-10 15:39:02 +08:00
javascripts	添加course_group表单到数据库中，并建立对应于members和courses之间的关联，	2014-12-02 14:41:36 +08:00
plugin_assets	Signed-off-by: alan <547533434@qq.com>	2014-11-13 11:09:47 +08:00
statistics/trustie2	move 2013.8.29	2013-08-30 09:34:21 +08:00
stylesheets	Signed-off-by: alan <547533434@qq.com>	2015-01-10 17:27:08 +08:00
themes	修改作业左侧启动匿评按钮样式	2014-11-22 12:40:53 +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