jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/config
History
xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/my_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/users_controller.rb
	app/helpers/projects_helper.rb
	app/helpers/users_helper.rb
	app/models/project.rb
	app/models/user.rb
	app/models/user_extensions.rb
	app/views/account/register.html.erb
	app/views/bids/_bid_show.html.erb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	app/views/files/index.html.erb
	app/views/layouts/base_bids.html.erb
	app/views/layouts/base_users.html.erb
	app/views/my/account.html.erb
	app/views/users/watch_bids.html.erb
	config/locales/en.yml
	config/locales/zh.yml
	config/routes.rb
	db/schema.rb
	lib/redmine.rb
	public/stylesheets/application.css
 		2013-09-23 20:18:03 +08:00
..
environments first commit 2013-08-01 10:33:49 +08:00
initializers 加入了对赞功能模块，同时预留了踩功能，但暂时不使用。 2013-08-08 17:01:56 +08:00
locales 修改了项目里面一些bug 2013-09-23 13:35:29 +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 修改留言功能 2013-09-14 08:45:18 +08:00
boot.rb first commit 2013-08-01 10:33:49 +08:00
configuration.yml 新改 2013-08-15 18:50:44 +08:00
configuration.yml.example first commit 2013-08-01 10:33:49 +08:00
database.yml 修改了身份 2013-09-23 09:41:36 +08:00
database.yml.example first commit 2013-08-01 10:33:49 +08:00
environment.rb first commit 2013-08-01 10:33:49 +08:00
preinitializer.rb first commit 2013-08-01 10:33:49 +08:00
routes.rb 修改了项目里面一些bug 2013-09-23 13:35:29 +08:00
settings.yml 给tag search结果添加了分页。 2013-08-19 17:28:59 +08:00