wangshusheng / YOHOBUYPC · Commits

28 Oct, 2015

40 commits

修改新品到着，折扣专区的数据处理方式
062cbb2f

by Rock Zhang
2015-10-28 21:26:12 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a078816a

by xuqi
2015-10-28 21:05:18 +0800
Browse Files
goods container
c2258d06

by xuqi
2015-10-28 21:05:08 +0800
Browse Files
update
1c1f4368

by 梁志锋
2015-10-28 20:51:31 +0800
Browse Files
update
d97a69ac

by 梁志锋
2015-10-28 20:48:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c536f394

by xuqi
2015-10-28 20:36:41 +0800
Browse Files
msort -> sort
29c64767

by xuqi
2015-10-28 20:36:21 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
a485a38a

by 梁志锋
2015-10-28 20:32:49 +0800
Browse Files
update
564a6d3b

by 梁志锋
2015-10-28 20:32:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
62fa7b79

by xuqi
2015-10-28 20:09:25 +0800
Browse Files
product reload bug
4d635dd3

by xuqi
2015-10-28 20:09:09 +0800
Browse Files
update
9c1d4769

by 梁志锋
2015-10-28 19:53:04 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
9675a3e2

by 梁志锋
2015-10-28 19:52:27 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:web/yohobuy into develop
ec641c3d

by Rock Zhang
2015-10-28 19:41:09 +0800
Browse Files
modify Images.php use regex to php function
23a5584c

by hf
2015-10-28 19:37:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
ddf0e5b9

by xuqi
2015-10-28 19:36:45 +0800
Browse Files
partials good list
33d5cae9

by xuqi
2015-10-28 19:36:32 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into test
3445d7df

by hf
2015-10-28 19:27:59 +0800
Browse Files
do gulp ge to gzip css js
157fe40d

by hf
2015-10-28 19:27:49 +0800
Browse Files
fixes bug to guang detail page brand link click
0c167940

by hf
2015-10-28 19:26:38 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
4b6a0880

by Rock Zhang
2015-10-28 19:20:08 +0800
Browse Files
add attr query to search
44a9e067

by xuqi
2015-10-28 19:19:42 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
d2197f59
```
Conflicts:
	library/LibModels/Wap/Product/SearchData.php
	library/Plugin/Helpers.php
```
by Rock Zhang
2015-10-28 19:05:59 +0800
Browse Files
do modify search api to new test
866b43e0

by hf
2015-10-28 18:49:39 +0800
Browse Files
修复搜索图片处理的bug
91b23673

by Rock Zhang
2015-10-28 18:45:18 +0800
Browse Files
do modify search api to new test
f994f4e0

by hf
2015-10-28 18:24:37 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
143b0e95

by Rock Zhang
2015-10-28 18:21:12 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:web/yohobuy into test ...
7cda0df7
```
Conflicts:
	library/LibModels/Wap/Product/SearchData.php
```
by Rock Zhang
2015-10-28 18:19:06 +0800
Browse Files
do modify search api to new test
004f5ecb

by hf
2015-10-28 18:11:46 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
f2e29cb5

by 梁志锋
2015-10-28 18:01:47 +0800
Browse Files
update
6b73dc8b

by 梁志锋
2015-10-28 18:01:37 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into test
bf366bdd

by hf
2015-10-28 17:47:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
aca0e2dd

by xuqi
2015-10-28 17:21:58 +0800
Browse Files
update
c00b2b8e

by 梁志锋
2015-10-28 17:19:59 +0800
Browse Files
info tags
51171c08

by xuqi
2015-10-28 17:11:52 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7d719031

by xuqi
2015-10-28 16:47:09 +0800
Browse Files
init with eyes close
a4761aae

by xuqi
2015-10-28 16:45:34 +0800
Browse Files
merge code
d18302d9

by ccbikai
2015-10-28 16:36:50 +0800
Browse Files
频道选择页面顶部搜索
3ef4c70c

by ccbikai
2015-10-28 16:36:02 +0800
Browse Files
do modify search action to check is brand or category
413fa1be

by hf
2015-10-28 16:11:47 +0800
Browse Files