fe / YOHOBUYWAP · Commits

31 Dec, 2015

2 commits

修改代码格式
674619aa

by yangyang
2015-12-31 12:01:22 +0800
Browse Files
合并代码
7384270f

by yangyang
2015-12-31 09:39:09 +0800
Browse Files

30 Dec, 2015

23 commits

调整返回前台的数据结构
02530762

by 周少峰
2015-12-30 20:31:56 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/brand
1d32fc41

by yangyang
2015-12-30 20:31:18 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop-sefon
6abcfb46

by 周少峰
2015-12-30 20:26:12 +0800
Browse Files
Merge branch 'master' into develop
ce9d0f98

by hf
2015-12-30 20:25:43 +0800
Browse Files
code review by hf: do format guang code handle call api exception use two level cache
115b9068

by hf
2015-12-30 20:19:22 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/brand
5ecf8861

by yangyang
2015-12-30 19:59:06 +0800
Browse Files
获取品牌folder
a7656718

by yangyang
2015-12-30 19:58:49 +0800
Browse Files
code review by hf: do format guang code handle call api exception use two level cache
7bdce688

by hf
2015-12-30 19:31:30 +0800
Browse Files
code review by hf: do format guang code handle call api exception use two level cache
c3868aa2

by hf
2015-12-30 19:27:31 +0800
Browse Files
商品列表页模板修改 code review by liuyue
36c0266c

by lore-w
2015-12-30 18:59:08 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop-sefon
e47d9ee8

by 周少峰
2015-12-30 18:55:54 +0800
Browse Files
注册获取验证码修改 code review by liuyue
805dc656

by lore-w
2015-12-30 18:01:11 +0800
Browse Files
code review by hf: do add register analysis code
ac215f43

by hf
2015-12-30 17:18:20 +0800
Browse Files
use.phtml报错问题 code review by liuyue
554de101

by lore-w
2015-12-30 17:03:24 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop-sefon
2369d2d5

by 周少峰
2015-12-30 14:57:46 +0800
Browse Files
code review by liuyue
d6206f79

by lore-w
2015-12-30 14:25:48 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/brand
874207b8

by yangyang
2015-12-30 14:20:04 +0800
Browse Files
修改品牌数据分类信息，修改分类列表返回数据格式
7d703b28

by yangyang
2015-12-30 14:19:11 +0800
Browse Files
修复商品标题太多时排版问题
d8740695

by lore-w
2015-12-30 14:15:55 +0800
Browse Files
code review by hf: do add analysis code
9a276e9b

by hf
2015-12-30 12:31:57 +0800
Browse Files
code review by hf: do add analysis code
158a47c8

by hf
2015-12-30 11:38:18 +0800
Browse Files
code review by hf: do add analysis code
e9dd2f07

by hf
2015-12-30 11:37:01 +0800
Browse Files
列表sale页面搜索条件调整
f8203300

by 周少峰
2015-12-30 10:32:11 +0800
Browse Files

29 Dec, 2015

15 commits

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

by hf
2015-12-29 17:50:53 +0800
Browse Files
code review by hf: do add 99click partner analysis code and add login,cart to support https config
91350fcf

by hf
2015-12-29 17:50:42 +0800
Browse Files
Merge branch 'master' into develop
0dfbb18a

by hf
2015-12-29 17:36:54 +0800
Browse Files
code review by hf: do add 99click partner analysis code and add login,cart to support https config
86a077c7

by hf
2015-12-29 17:20:59 +0800
Browse Files
code review by liuyue
57c3f52d

by lore-w
2015-12-29 17:03:22 +0800
Browse Files
与后台联调，ajax请求修改
0c6a77f2

by lore-w
2015-12-29 17:02:16 +0800
Browse Files
code review by hf: do add 99click partner analysis code and add login,cart to support https config
bed04294

by hf
2015-12-29 16:19:44 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/brand ...
4dff25ca
```
Conflicts:
	yohobuy/www.yohobuy.com/application/Bootstrap.php
	yohobuy/www.yohobuy.com/application/modules/Product/controllers/Index.php
```
by yangyang
2015-12-29 15:15:57 +0800
Browse Files
赠品加价购不显示小房子
f429fc21

by 毕凯
2015-12-29 15:14:16 +0800
Browse Files
gender获取代码微调
9e14901c

by yangyang
2015-12-29 15:06:53 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
aca9cb81

by lore-w
2015-12-29 13:29:42 +0800
Browse Files
code review by liuyue
cc04751d

by lore-w
2015-12-29 13:29:20 +0800
Browse Files
搜索页990
6cc2b03f

by lore-w
2015-12-29 13:28:28 +0800
Browse Files
ie8 indexOf 不兼容
cf147481

by weiqingting
2015-12-29 13:27:03 +0800
Browse Files
ie8 indexOf 不兼容
f6301655

by weiqingting
2015-12-29 13:26:56 +0800
Browse Files