You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

huang 7d87915413 Merge branch 'szzh' into dev_hjq ... Conflicts: app/helpers/application_helper.rb app/helpers/files_helper.rb app/views/courses/_course_members.html.erb app/views/courses/settings.html.erb app/views/homework_attach/_homework.html.erb public/javascripts/course.js public/stylesheets/courses.css public/stylesheets/public.css		10 years ago
..
environments	1. 将session改为跨子域。 2. 将session的存储改到files/cache_store下，用于nfs	10 years ago
initializers	Merge branch 'szzh' into dev_hjq	10 years ago
locales	Merge branch 'szzh' into dev_hjq	10 years ago
additional_environment.rb	Add sub-uri	12 years ago
additional_environment.rb.example	first commit	12 years ago
application.rb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	10 years ago
boot.rb	first commit	12 years ago
configuration.yml	Merge branch 'szzh' into dev_hjq	10 years ago
configuration.yml.example	first commit	12 years ago
environment.rb	修改contest中出现的逻辑错误	11 years ago
newrelic.yml	newrelic配置文件	10 years ago
preinitializer.rb	first commit	12 years ago
routes.rb	Merge branch 'szzh' into dev_hjq	10 years ago
settings.yml	增加隐藏非项目信息按钮以及路由	10 years ago