huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq ... Conflicts: app/helpers/application_helper.rb app/helpers/files_helper.rb app/helpers/members_helper.rb app/models/journals_for_message.rb app/models/mailer.rb app/models/user.rb app/views/attachments/_form.html.erb app/views/bids/_new_homework_form.html.erb app/views/boards/_project_show.html.erb app/views/courses/_courses_jours.html.erb app/views/courses/feedback.html.erb app/views/courses/new_homework.html.erb app/views/courses/settings.html.erb app/views/issues/_list.html.erb app/views/issues/new.html.erb app/views/messages/_project_show.html.erb app/views/messages/edit.html.erb app/views/news/_project_news.html.erb app/views/projects/invite_members.html.erb app/views/projects/settings/_modules.html.erb app/views/projects/show.html.erb config/configuration.yml config/locales/zh.yml db/schema.rb public/assets/kindeditor/kindeditor.js public/javascripts/course.js public/stylesheets/courses.css public/stylesheets/public.css		2015-04-16 10:26:03 +08:00
..
environments	1. 将session改为跨子域。 2. 将session的存储改到files/cache_store下，用于nfs	2015-04-13 20:44:46 +08:00
initializers	Merge branch 'szzh' into dev_hjq	2015-04-16 10:26:03 +08:00
locales	Merge branch 'szzh' into dev_hjq	2015-04-16 10:26:03 +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	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-04-07 13:47:39 +08:00
boot.rb	first commit	2013-08-01 10:33:49 +08:00
configuration.yml	Merge branch 'szzh' into dev_hjq	2015-04-16 10:26:03 +08:00
configuration.yml.example	first commit	2013-08-01 10:33:49 +08:00
environment.rb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
newrelic.yml	newrelic配置文件	2015-01-27 14:25:06 +08:00
preinitializer.rb	first commit	2013-08-01 10:33:49 +08:00
routes.rb	Merge branch 'szzh' into dev_hjq	2015-04-16 10:26:03 +08:00
settings.yml	增加隐藏非项目信息按钮以及路由	2015-04-09 10:33:15 +08:00