fe / YOHOBUYPC · Commits

16 Feb, 2016

22 commits

Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap
7918634d

by 梁志锋
2016-02-16 13:11:13 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
f9f1c5f3

by Rock Zhang
2016-02-16 13:09:59 +0800
Browse Directory »
切换到测试环境接口地址
f44947a4

by Rock Zhang
2016-02-16 13:09:45 +0800
Browse Files
侧边栏修改
5692ed24

by 梁志锋
2016-02-16 13:04:37 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
8bb0a230

by Rock Zhang
2016-02-16 12:55:15 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap ...
d64f1365
```
Conflicts:
	yohobuy/m.yohobuy.com/application/models/Index/User.php
```
by Rock Zhang
2016-02-16 12:54:58 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap ...
dff933c2
```
Conflicts:
	yohobuy/m.yohobuy.com/application/models/Index/User.php
```
by Rock Zhang
2016-02-16 12:54:10 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
93a413b2

by Rock Zhang
2016-02-16 12:03:03 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap ...
8823ed45
```
Conflicts:
	yohobuy/m.yohobuy.com/application/models/Index/User.php
```
by Rock Zhang
2016-02-16 12:02:45 +0800
Browse Files
收藏的商品以及品牌的bug修复
da8196f0

by Rock Zhang
2016-02-16 12:02:12 +0800
Browse Directory »
Merge branch 'develop/wap' into beta/wap
04395897

by Rock Zhang
2016-02-16 11:58:08 +0800
Browse Files
收藏的商品以及品牌的bug修复
e6259ad5

by Rock Zhang
2016-02-16 11:57:39 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
af7c7715

by Rock Zhang
2016-02-16 11:30:59 +0800
Browse Files
修复删除记录时传递的skn为空的bug ...
7fcc0812
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-16 11:30:12 +0800
Browse Files
更新到201602161121静态资源
6e35fdf9

by Rock Zhang
2016-02-16 11:21:12 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap ...
d8bf8cb3
```
Conflicts:
	library/Api/Yohobuy.php
```
by Rock Zhang
2016-02-16 11:20:08 +0800
Browse Files
修复收藏的商品以及收藏的品牌会报错的bug ...
31d90cf4
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-16 11:18:34 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
85011821

by Rock Zhang
2016-02-16 09:51:29 +0800
Browse Files
修复当接口返回的品类数据为空时，搜索列表会报错的bug ...
2b7455de
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-16 09:49:43 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
ad695f0e

by hf
2016-02-16 09:31:32 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap
9bcf0835

by hf
2016-02-16 09:31:03 +0800
Browse Files
code review by fei.hong : do modify cache.php
ec3dfec5

by hf
2016-02-16 09:30:48 +0800
Browse Files

15 Feb, 2016

18 commits

Merge remote-tracking branch 'origin/develop/wap' into beta/wap
d1cdd5fd

by 梁志锋
2016-02-15 19:01:02 +0800
Browse Files
去除搜索品牌页右上角的导航
37a31ca2

by Rock Zhang
2016-02-15 18:55:56 +0800
Browse Files
修复skn传值为空时会清除所有浏览记录的bug ...
f4c1f535
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-15 18:54:44 +0800
Browse Files
改成测试环境数据
58dbf203

by 梁志锋
2016-02-15 18:49:57 +0800
Browse Files
提交gulp ge文件
0de95427

by 梁志锋
2016-02-15 18:39:07 +0800
Browse Files
only test css
ff384f78

by 梁志锋
2016-02-15 18:37:16 +0800
Browse Files
提交gulp ge 文件
1f588ccd

by 梁志锋
2016-02-15 18:10:19 +0800
Browse Files
修改侧边栏效果
f9ea52e2

by 梁志锋
2016-02-15 18:09:02 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/develop/wap' into beta/wap
87d82242

by 梁志锋
2016-02-15 18:08:04 +0800
Browse Files
修改侧边栏效果
13f46718

by 梁志锋
2016-02-15 18:04:34 +0800
Browse Files
merge develop branch
1b311038

by 梁志锋
2016-02-15 17:48:54 +0800
Browse Files
修改侧边栏效果
611a8532

by 梁志锋
2016-02-15 17:39:48 +0800
Browse Files
修改侧边栏效果
424ce915

by 梁志锋
2016-02-15 17:38:03 +0800
Browse Files
提交gulp ge文件
98d94681

by 梁志锋
2016-02-15 17:22:42 +0800
Browse Files
Merge remote-tracking branch 'origin/develop/wap' into beta/wap
fbe9662f

by 梁志锋
2016-02-15 17:21:36 +0800
Browse Files
修改字体颜色
d4132e25

by 梁志锋
2016-02-15 16:11:55 +0800
Browse Files
提交gulp ge文件
8cb3c37e

by 梁志锋
2016-02-15 09:43:28 +0800
Browse Files
Merge remote-tracking branch 'origin/develop/wap' into beta/wap
b9349b50

by 梁志锋
2016-02-15 09:40:35 +0800
Browse Files