xianbo 66a5db5ad3 Merge branch 'szzh' into develop ... Conflicts: config/routes.rb db/schema.rb		2014-05-15 09:46:38 +08:00
..
environments	share completed with fq, xianbo	2013-10-21 08:57:55 +08:00
initializers	加入了对赞功能模块，同时预留了踩功能，但暂时不使用。	2013-08-08 17:01:56 +08:00
locales	Merge branch 'szzh' into develop	2014-05-15 09:46:38 +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	0418	2014-04-18 10:46:29 +08:00
boot.rb	first commit	2013-08-01 10:33:49 +08:00
configuration.yml	fix setting about migrate path	2014-01-02 09:11:38 +08:00
configuration.yml.example	first commit	2013-08-01 10:33:49 +08:00
database.yml.example	fixtures fix, header fix dynamic.	2014-02-19 17:23:24 +08:00
environment.rb	1.添加部分默认数据	2014-05-13 15:49:14 +08:00
preinitializer.rb	first commit	2013-08-01 10:33:49 +08:00
routes.rb	Merge branch 'szzh' into develop	2014-05-15 09:46:38 +08:00
settings.yml	issues#377 074e8adf 引入的issue页面权限问题，除了控制器还修改过views判断语句 keyworks: @edit_allowed	2014-04-24 10:16:49 +08:00