huang 0a989daf31 Merge branch 'cxt_course' into develop ... Conflicts: app/helpers/application_helper.rb public/stylesheets/courses.css public/stylesheets/new_user.css		2016-05-06 18:12:08 +08:00
..
environments	日志级别在debug环境下 调整为debug	2015-07-27 10:03:45 +08:00
initializers	merge	2016-03-21 16:02:30 +08:00
locales	Merge branch 'cxt_course' into develop	2016-05-06 12:22:43 +08:00
additional_environment.rb.example	添加附加环境模板	2016-03-30 14:52:11 +08:00
application.rb	Merge remote-tracking branch 'origin/develop' into guange_dev	2016-04-24 10:40:36 +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
menu.yml	微信url切换到正式版	2016-04-13 14:52:18 +08:00
newrelic.yml	newrelic配置文件	2015-01-27 14:25:06 +08:00
oneapm.yml	boards#index性能优化	2016-04-24 12:48:03 +08:00
preinitializer.rb	first commit	2013-08-01 10:33:49 +08:00
private.key	添加key	2016-05-04 16:33:56 +08:00
query_reviewer.yml	boards#index性能优化	2016-04-24 12:48:03 +08:00
routes.rb	Merge branch 'cxt_course' into develop	2016-05-06 18:12:08 +08:00
settings.yml	配置中增加一个 隐藏课程信息的功能	2016-04-24 14:23:08 +08:00
wechat.yml	修改wechat配置	2016-03-01 14:33:36 +08:00