trustieforge

Author	SHA1	Message	Date
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	12 years ago
fanqiang	1781d3ba8d	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop Conflicts: app/views/layouts/base_bids.html.erb	12 years ago
huangjingquan	bf1f9b8e19	remove .bundle from ignored file list	12 years ago
huangjingquan	eb2fce200d	add test/* and tmp/* to ignore files list	12 years ago
huangjingquan	36686d6cf3	modify the .gitignote file	12 years ago
huangjingquan	70b211e355	first commit	12 years ago