wangshusheng / YOHOBUYPC · Commits

17 Nov, 2015

40 commits

解决冲突
a54ca1a2

by yangyang
2015-11-17 17:32:01 +0800
Browse Files
支付做了一半
fcbe915d

by yangyang
2015-11-17 17:29:35 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
18845d11

by lore-w
2015-11-17 17:27:05 +0800
Browse Files
图片上传
bf07488b

by lore-w
2015-11-17 17:26:50 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0f81ab2f

by ccbikai
2015-11-17 17:21:07 +0800
Browse Files
为您优选字体大小
e3e251df

by ccbikai
2015-11-17 17:21:03 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
2448c537

by Rock Zhang
2015-11-17 17:15:05 +0800
Browse Files
添加意见反馈图片上传路由
8b22116d

by Rock Zhang
2015-11-17 17:14:52 +0800
Browse Files
为您优选价格颜色
4f921562

by ccbikai
2015-11-17 17:10:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
2c83e5aa

by ccbikai
2015-11-17 16:49:32 +0800
Browse Files
个人中心顶部图片
922f0e57

by ccbikai
2015-11-17 16:49:28 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
a6bb6c59

by Rock Zhang
2015-11-17 16:41:37 +0800
Browse Files
添加意见反馈中图片上传的一些逻辑
876ceb02

by Rock Zhang
2015-11-17 16:41:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d2d0b436

by yangyang
2015-11-17 16:41:10 +0800
Browse Files
为了拉代码
17946598

by yangyang
2015-11-17 16:40:55 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c5aa356e

by uedxwg
2015-11-17 16:39:57 +0800
Browse Files
update
7a079a94

by uedxwg
2015-11-17 16:36:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
59239699

by xuqi
2015-11-17 16:35:12 +0800
Browse Files
优惠券
a0f2e468

by uedxwg
2015-11-17 16:31:17 +0800
Browse Files
个人中心首页超链接修改
35016cbe

by ccbikai
2015-11-17 16:30:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e837b6c5

by ccbikai
2015-11-17 16:23:50 +0800
Browse Files
添加地址
2a640b95

by ccbikai
2015-11-17 16:23:42 +0800
Browse Files
修改api，增加api2
7ceac95a

by yangyang
2015-11-17 16:22:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0b43a346

by xuqi
2015-11-17 16:13:28 +0800
Browse Files
order rebuild
57eb7107

by xuqi
2015-11-17 16:12:15 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
85518ccb

by yangyang
2015-11-17 16:07:28 +0800
Browse Files
改动格式
cb3245b6

by yangyang
2015-11-17 16:07:14 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
61ece867

by uedxwg
2015-11-17 16:07:10 +0800
Browse Files
upadte
2d26a888

by uedxwg
2015-11-17 16:06:51 +0800
Browse Files
修改新建地址接口
71ad7cce

by Rock Zhang
2015-11-17 16:02:27 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
b2fb985b

by Rock Zhang
2015-11-17 15:58:01 +0800
Browse Files
修改优惠券数据处理逻辑
6eab0b60

by Rock Zhang
2015-11-17 15:57:49 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
894a4d87

by ccbikai
2015-11-17 15:55:52 +0800
Browse Files
添加地址修改
965f6722

by ccbikai
2015-11-17 15:55:47 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
b7f47ef1
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by Rock Zhang
2015-11-17 15:55:20 +0800
Browse Files
temp
bc044878

by Rock Zhang
2015-11-17 15:52:14 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
2ca47f9c

by yangyang
2015-11-17 15:51:22 +0800
Browse Files
为了拉代码
87841988

by yangyang
2015-11-17 15:51:09 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
bc5ac903

by hf
2015-11-17 15:48:49 +0800
Browse Files
modify to add my center api url
74f21492

by hf
2015-11-17 15:48:36 +0800
Browse Files