fe / YOHOBUYWAP · Commits

05 Dec, 2015

40 commits

fixes bug to call product detail api and order status
ab08119f

by hf
2015-12-05 20:09:31 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0a1eaf97

by hf
2015-12-05 19:56:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
8833b5c6

by biao
2015-12-05 19:37:01 +0800
Browse Files
resolve conflict
aec404d4

by biao
2015-12-05 19:36:38 +0800
Browse Files
add prefix for flexbox. code review by XWG
911ec182

by biao
2015-12-05 19:33:25 +0800
Browse Files
code reviewed by zhaobiao
c9e528cc

by Lynnic
2015-12-05 19:28:40 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/detailFix
5c2bc319

by Lynnic
2015-12-05 19:27:47 +0800
Browse Files
修改咨询页面图标 code reviewed by zhaobiao
3f9d0259

by Lynnic
2015-12-05 19:27:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b6c5ef03

by hf
2015-12-05 19:15:41 +0800
Browse Files
Merge branch 'test' of http://git.dev.yoho.cn/web/yohobuy into test
7de46894

by hf
2015-12-05 19:11:47 +0800
Browse Files
do fixes bug to product detail page
529438f7

by hf
2015-12-05 19:11:22 +0800
Browse Files
Merge branch 'feature/detailFix' into develop
dab2000d

by Lynnic
2015-12-05 19:05:39 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/detailFix
d23f50db

by Lynnic
2015-12-05 19:04:31 +0800
Browse Files
修改商品咨询页面链接url -- code viewed by liangzhifeng
92bfbdc4

by Lynnic
2015-12-05 19:04:11 +0800
Browse Files
Merge branch 'feature/xieweiguang' into develop
fc9b1703

by uedxwg
2015-12-05 18:52:00 +0800
Browse Files
hotrank添加导航高亮效果
ee56fa83

by uedxwg
2015-12-05 18:50:04 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/detailFix
7407e284

by Lynnic
2015-12-05 18:16:35 +0800
Browse Files
修改购物车页面逻辑bug --code viewed by Hongfei
a9905e5e

by Lynnic
2015-12-05 18:16:14 +0800
Browse Files
yohood单词拼写错误 code review by zhaobiao
6543ad66

by 梁志锋
2015-12-05 18:14:18 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/detailFix ...
411af026
```
Conflicts:
	template/m.yohobuy.com/actions/product/detail/index.phtml
	template/m.yohobuy.com/partials/product/feedback-tab.phtml
```
by Lynnic
2015-12-05 18:09:58 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
e276d026

by Lynnic
2015-12-05 18:06:23 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
43454a81
```
Conflicts:
	template/m.yohobuy.com/partials/product/feedback-tab.phtml
```
by Lynnic
2015-12-05 18:04:56 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
3c8a4d01

by biao
2015-12-05 18:04:44 +0800
Browse Files
fix detail table style issue. code review by XWG
39a3a97e

by biao
2015-12-05 18:04:36 +0800
Browse Files
fix detail table style issue. code review by XWG
a5df46dc

by biao
2015-12-05 18:03:46 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
9ac767e1
```
Conflicts:
	template/m.yohobuy.com/actions/product/detail/index.phtml
```
by Lynnic
2015-12-05 18:00:42 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4cc93361

by uedxwg
2015-12-05 18:00:16 +0800
Browse Files
修改字体库，修改热门排行 by @赵彪备：忘了切换分支
c9bdaef2

by uedxwg
2015-12-05 17:59:41 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
9313ecef

by 梁志锋
2015-12-05 17:55:20 +0800
Browse Files
yohood单词错误
ce310440

by 梁志锋
2015-12-05 17:55:14 +0800
Browse Files
Merge branch 'feature/detailFix' into develop
d66f8f80

by Lynnic
2015-12-05 17:44:02 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
96b4caee

by Lynnic
2015-12-05 17:40:51 +0800
Browse Files
修改咨询页面跳转链接 --code viewed by zhaobiao
ef22db14

by Lynnic
2015-12-05 17:39:59 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/detailFix
a530684a

by Lynnic
2015-12-05 17:28:15 +0800
Browse Files
更新到201512051727静态资源
16970e26

by Rock Zhang
2015-12-05 17:27:08 +0800
Browse Files
Merge branch 'develop' into test
4f48fd2d

by Rock Zhang
2015-12-05 17:26:37 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
0eba777e

by Rock Zhang
2015-12-05 17:25:28 +0800
Browse Files
添加个人中心购物车地址 ...
1739b5fc
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-05 17:25:05 +0800
Browse Files
评论咨询tab跳转要绑定到外层元素上 -- code reviewed by zhaobiao
1e0b93ec

by Lynnic
2015-12-05 17:24:56 +0800
Browse Files
更新到201512051712静态资源
e10f8629

by Rock Zhang
2015-12-05 17:12:47 +0800
Browse Files