fe / YOHOBUYWAP · Commits

01 Nov, 2015

40 commits

Merge branch 'develop' into test
dcf118cd

by Rock Zhang
2015-11-01 18:00:16 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:web/yohobuy into test
7330b077

by Rock Zhang
2015-11-01 17:59:01 +0800
Browse Files
修复注册时秘密输入错误时的提示信息
cdd4fc28

by Rock Zhang
2015-11-01 17:58:54 +0800
Browse Files
限制对输入新密码页面的访问
3300d955

by Rock Zhang
2015-11-01 17:50:58 +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
modify search to use new elastic engine
826d8d2b

by hf
2015-11-01 16:39:59 +0800
Browse Files
update
01f55b1f

by 梁志锋
2015-11-01 16:36:51 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
29206183

by Rock Zhang
2015-11-01 16:12:48 +0800
Browse Files
修复商品搜索排序错误的bug
9b308b4d

by Rock Zhang
2015-11-01 16:12:04 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0d10d59d

by xuqi
2015-11-01 15:47:34 +0800
Browse Files
analysis script
292afcd5

by xuqi
2015-11-01 15:47:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6a5d0d57

by ccbikai
2015-11-01 15:27:39 +0800
Browse Files
显示底部 tab
bfa44c98

by ccbikai
2015-11-01 15:27:35 +0800
Browse Files
add border to ul bottom
de4b10f8

by xuqi
2015-11-01 15:03:43 +0800
Browse Files
suspend cart font-size
91fa4d22

by xuqi
2015-11-01 14:55:31 +0800
Browse Files
通用底部登录位置返回顶部JS
08682ba8

by ccbikai
2015-11-01 14:43:52 +0800
Browse Files
Merge test
354cf567

by Rock Zhang
2015-11-01 14:21:10 +0800
Browse Files
Merge branch 'test' into develop
33cdc7dd

by Rock Zhang
2015-11-01 14:18:53 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
9e2f65b9
```
Conflicts:
	library/Plugin/DataProcess/ListProcess.php
```
by Rock Zhang
2015-11-01 14:11:40 +0800
Browse Files
潮人搭配 swiper 滚动
d9516f88

by ccbikai
2015-11-01 14:06:16 +0800
Browse Files