fe / YOHO-ACTIVITY-PHP · Commits

04 Dec, 2015

1 commit

update
5d01a357

by Lynnic
2015-12-04 10:00:26 +0800
Browse Files

03 Dec, 2015

39 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/detailFix
16baf5d4

by Lynnic
2015-12-03 21:40:35 +0800
Browse Files
合并线上代码 -- viewed by liangzhifeng
d4c7f90a

by Lynnic
2015-12-03 21:32:29 +0800
Browse Files
Merge branch 'feature/detailFix' of git.dev.yoho.cn:web/yohobuy into feature/detailFix
c6cf3ed8

by Lynnic
2015-12-03 21:29:23 +0800
Browse Files
新品节错误修改 --viewed by liangzhifeng
e103234c

by Lynnic
2015-12-03 21:28:06 +0800
Browse Files
新品节bug修改
e3894a47

by Lynnic
2015-12-03 21:11:04 +0800
Browse Files
修复个人中心首页报错的bug
ad978eaa

by Rock Zhang
2015-12-03 20:50:25 +0800
Browse Files
修复各频道首页报错的bug，是由楼层数据为空导致
54d7233f

by Rock Zhang
2015-12-03 20:47:21 +0800
Browse Files
增加新品节标签
f37fa35f

by Lynnic
2015-12-03 20:46:53 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
028fb15f

by Rock Zhang
2015-12-03 20:45:11 +0800
Browse Files
Merge branch 'feature/fixed-bottom' into 'develop' ...
c5e5304c
```
Feature/fixed bottom

See merge request !16
```
by 梁志锋
2015-12-03 20:38:30 +0800
Browse Files
模特表格中，空数据要留白
6e5d0a38

by Lynnic
2015-12-03 20:37:18 +0800
Browse Files
remove layer position calculation code
9d0ab03f

by biao
2015-12-03 20:34:51 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
5c76a41a

by Rock Zhang
2015-12-03 20:31:41 +0800
Browse Files
code review by hf: merge zhaobiao order logistic
3900a106

by hf
2015-12-03 20:29:41 +0800
Browse Files
code review by hf: merge zhaobiao order logistic
6e008898

by hf
2015-12-03 20:26:09 +0800
Browse Files
code review by hf: merge zhaobiao order logistic
5b499865

by hf
2015-12-03 20:09:43 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
2a8ab0c6

by Rock Zhang
2015-12-03 19:11:25 +0800
Browse Files
更新订单，个人中心，商品详情页，购物车接口地址
8f109db5

by Rock Zhang
2015-12-03 19:11:11 +0800
Browse Files
resolve conflict for mergerequest codereview by guanning
a68bfff5

by 梁志锋
2015-12-03 18:09:30 +0800
Browse Files
resolve conflict for mergerequest codereview by guanning
288b9cfb

by 梁志锋
2015-12-03 18:08:53 +0800
Browse Files
code review by hf: merge zhaobiao order logistic
f98cb0a5

by hf
2015-12-03 17:59:07 +0800
Browse Files
do home page view my order logistic
8a191280

by hf
2015-12-03 17:56:25 +0800
Browse Files
update according to interface
e005f55f

by biao
2015-12-03 17:38:47 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
c0dfac1f

by Rock Zhang
2015-12-03 17:33:43 +0800
Browse Files
Merge branch 'hotfix/apichange-bug' into develop
47395f6b

by Rock Zhang
2015-12-03 17:33:34 +0800
Browse Files
修复浏览记录价格显示的问题
3910f616

by Rock Zhang
2015-12-03 17:30:35 +0800
Browse Files
do home page view my order logistic
9e971929

by hf
2015-12-03 17:21:48 +0800
Browse Files
修复收藏的品牌商品default_images未定义报错的bug；修复有货币调用接口错误的bug
83469011

by Rock Zhang
2015-12-03 17:16:37 +0800
Browse Files
Merge branch 'feature/address' into 'develop' ...
9a8d90f7
```
修复 地址列表选择bug

See merge request !14
```
by chenglong.wang
2015-12-03 16:12:49 +0800
Browse Files
修复浏览记录页面显示分支冲突错误信息的bug
23e4c31b

by Rock Zhang
2015-12-03 15:59:00 +0800
Browse Files
地址列表选择bug
631deb76

by 毕凯
2015-12-03 15:52:19 +0800
Browse Files
修复新品标签的显示，如果既有new又有sale标签，只显示new标签
3fd4b565

by Rock Zhang
2015-12-03 15:50:54 +0800
Browse Files
do merge feature/order/yangyang code
b85e45c0

by hf
2015-12-03 15:50:51 +0800
Browse Files
修复各频道首页底部banner的banner报错的bug
942163b0

by Rock Zhang
2015-12-03 15:41:36 +0800
Browse Files
修复收藏的商品没有default_images时报错的bug
7410ad75

by Rock Zhang
2015-12-03 15:14:18 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
aab81f16

by Rock Zhang
2015-12-03 15:08:02 +0800
Browse Files
修复品牌brand_alif未定义时导致的错误
ffc3f724

by Rock Zhang
2015-12-03 15:07:31 +0800
Browse Files
修改无咨询数据时的页面样式
a49ed130

by Lynnic
2015-12-03 15:07:25 +0800
Browse Files
Code Review By BiKai ...
6064a1a1
```
Merge branch 'feature/fav-suggest' into 'develop'

Feature/fav suggest

See merge request !13
```
by 毕凯
2015-12-03 15:01:50 +0800
Browse Files