fe / YOHO-ACTIVITY-PHP · Commits

01 Nov, 2015

40 commits

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b67561e3

by ccbikai
2015-11-01 18:37:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
124c5ec3

by xuqi
2015-11-01 18:37:00 +0800
Browse Files
频道选择增加最小高度
8a5df14d

by ccbikai
2015-11-01 18:36:55 +0800
Browse Files
path err
9de851ba

by xuqi
2015-11-01 18:36:47 +0800
Browse Files
rmb icon
67d03b8e

by xuqi
2015-11-01 18:35:40 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
49f2b8e1

by ccbikai
2015-11-01 18:33:37 +0800
Browse Files
标准底部定位
5d2f7e18

by ccbikai
2015-11-01 18:33:31 +0800
Browse Files
update
a10f340b

by 梁志锋
2015-11-01 18:32:08 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
50ae15e0

by 梁志锋
2015-11-01 18:27:44 +0800
Browse Files
update css
4746d3d1

by 梁志锋
2015-11-01 18:27:21 +0800
Browse Files
底部tab预留链接
390aac38

by ccbikai
2015-11-01 18:25:59 +0800
Browse Files
依赖修复
eeb2eac1

by ccbikai
2015-11-01 18:20:31 +0800
Browse Files
update
aba44825

by 梁志锋
2015-11-01 18:14:10 +0800
Browse Files
update
1d2b82c3

by 梁志锋
2015-11-01 18:13:27 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
512b9b40

by ccbikai
2015-11-01 18:12:44 +0800
Browse Files
合并代码
52551da0

by ccbikai
2015-11-01 18:12:19 +0800
Browse Files
relative path
052543b3

by xuqi
2015-11-01 18:07:31 +0800
Browse Files
suspend update count
905d3f3b

by xuqi
2015-11-01 18:04:54 +0800
Browse Files
品牌搜索
4775d447

by ccbikai
2015-11-01 17:54:04 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
76d6db6c

by hf
2015-11-01 17:43:42 +0800
Browse Files
update
72b32eca

by 梁志锋
2015-11-01 17:42:22 +0800
Browse Files
Merge branch 'test' of http://git.dev.yoho.cn/web/yohobuy into test
aceac503

by hf
2015-11-01 17:42:03 +0800
Browse Files
modify search brand no data
8b58dd4b

by hf
2015-11-01 17:41:54 +0800
Browse Files
update
47aa708c

by 梁志锋
2015-11-01 17:41:49 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
29084d58

by xuqi
2015-11-01 17:25:52 +0800
Browse Files
sub undefined bug
77ba7f56

by xuqi
2015-11-01 17:24:13 +0800
Browse Files
Merge branch 'test' into develop
462022e3

by xuqi
2015-11-01 17:21:09 +0800
Browse Files
Merge branch 'develop' into test
038b79f6

by Rock Zhang
2015-11-01 17:19:08 +0800
Browse Files
添加筛选数据处理model
456a5025

by Rock Zhang
2015-11-01 17:18:13 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
2eb31045

by Rock Zhang
2015-11-01 17:16:46 +0800
Browse Files
修复筛选数据错误的bug
0792ade0

by Rock Zhang
2015-11-01 17:16:40 +0800
Browse Files
modify to fixes bug guang author list show author info repeat
86670c57

by hf
2015-11-01 17:15:20 +0800
Browse Files
author -> authorInfo
c255059b

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

by xuqi
2015-11-01 17:08:23 +0800
Browse Files
collected brand status
9db9d760

by xuqi
2015-11-01 17:08:11 +0800
Browse Files
modify the css of maybelike
b582a5fc

by 梁志锋
2015-11-01 17:03:34 +0800
Browse Files
guang loading
e806b801

by xuqi
2015-11-01 16:47:55 +0800
Browse Files
Merge branch 'test' into develop ...
cb429cb7
```
Conflicts:
	library/Plugin/DataProcess/ListProcess.php
```
by Rock Zhang
2015-11-01 16:46:07 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
4a36dbca

by Rock Zhang
2015-11-01 16:44:27 +0800
Browse Files
添加品牌商品列表页会自动添加gender参数，添加列表筛选数据会根据品牌、品类、一般搜索返回
184145ba

by Rock Zhang
2015-11-01 16:44:19 +0800
Browse Files