z9hang 0f9915fc2a Merge branch 'szzh' into api ... Conflicts: Gemfile Gemfile.lock app/controllers/bids_controller.rb app/controllers/users_controller.rb db/schema.rb		2015-01-13 15:12:05 +08:00
..
extra/redmine_pm	1.修改测试环境搭建文档	2014-06-23 14:51:57 +08:00
fixtures	<merge code from dev_dingxu>	2015-01-10 17:27:42 +08:00
functional	Signed-off-by: alan <547533434@qq.com>	2015-01-10 17:27:08 +08:00
integration	Signed-off-by: alan <547533434@qq.com>	2014-11-13 10:18:07 +08:00
mobile	将注册功能移动到UserService中	2014-12-03 17:29:03 +08:00
mocks	1.修改测试环境搭建文档	2014-06-23 14:51:57 +08:00
performance	导航栏防止意外http参数不全的错误	2014-02-17 15:37:04 +08:00
ui	1.修改测试环境搭建文档	2014-06-23 14:51:57 +08:00
unit	Signed-off-by: alan <547533434@qq.com>	2015-01-10 17:27:08 +08:00
object_helpers.rb	1.修改测试环境搭建文档	2014-06-23 14:51:57 +08:00
test_helper.rb	自动化测试环境	2014-07-14 16:11:38 +08:00