socialforge/config
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
2016-03-15 13:40:33 +08:00
..
environments 日志级别在debug环境下 调整为debug 2015-07-27 10:03:45 +08:00
initializers 修复team.trustie.net的侧栏点击后没有显示栏目内容的问题 2016-02-23 13:07:42 +08:00
locales Merge branch 'develop' into linchun 2016-03-08 11:29:58 +08:00
application.rb 还原分组作业 2015-12-03 10:41:27 +08:00
boot.rb first commit 2013-08-01 10:33:49 +08:00
configuration.yml.example 改为默认模板 2015-12-21 15:15:39 +08:00
configuration.yml.template 增加了两个template文件,大家下拉代码后将template文件复制去掉后尾的template就行 2015-12-18 09:21:05 +08:00
environment.rb 修改contest中出现的逻辑错误 2014-10-23 11:30:34 +08:00
newrelic.yml newrelic配置文件 2015-01-27 14:25:06 +08:00
oneapm.yml 加入性能分析 oneapm 2015-05-26 23:09:10 +08:00
preinitializer.rb first commit 2013-08-01 10:33:49 +08:00
routes.rb Merge branch 'develop' into ouyangxuhua 2016-03-15 13:40:33 +08:00
settings.yml at是否开启加入到配置 2015-12-18 17:02:50 +08:00