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
..
environments	share completed with fq, xianbo	2013-10-21 08:57:55 +08:00
initializers	Merge branch 'szzh' into api	2015-01-13 15:12:05 +08:00
locales	Signed-off-by: alan <547533434@qq.com>	2015-01-10 11:46:39 +08:00
additional_environment.rb	Add sub-uri	2013-08-11 15:05:55 +08:00
additional_environment.rb.example	first commit	2013-08-01 10:33:49 +08:00
application.rb	取消启用assets，原因：启用后界面样式不对	2014-12-11 11:54:42 +08:00
boot.rb	first commit	2013-08-01 10:33:49 +08:00
configuration.yml	解决#1220 甘特图 PNG 格式中文乱码问题	2014-10-27 17:22:32 +08:00
configuration.yml.example	first commit	2013-08-01 10:33:49 +08:00
database.yml.example	Signed-off-by: alan <547533434@qq.com>	2015-01-10 11:46:39 +08:00
environment.rb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
preinitializer.rb	first commit	2013-08-01 10:33:49 +08:00
routes.rb	Merge branch 'szzh' into api	2015-01-13 15:12:05 +08:00
settings.yml	修改作业提交项目第一项为请选择	2014-11-25 10:35:43 +08:00