wangshusheng / YOHOBUYPC · Commits

17 Feb, 2016

3 commits

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

by hf
2016-02-17 10:58:35 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
d7b237d8

by hf
2016-02-17 10:58:15 +0800
Browse Files
code review by fei.hong: do modify app hotfix patch url
2a20bd49

by hf
2016-02-17 10:56:40 +0800
Browse Files

16 Feb, 2016

37 commits

gulp ge文件提交
9d84451a

by 梁志锋
2016-02-16 20:20:32 +0800
Browse Files
侧边栏滚动效果修改
8b16b22f

by 梁志锋
2016-02-16 20:19:33 +0800
Browse Files
gulp ge文件提交
348d6a97

by 梁志锋
2016-02-16 20:03:21 +0800
Browse Files
侧边栏滚动效果修改
80d01714

by 梁志锋
2016-02-16 20:02:34 +0800
Browse Files
gulp ge 文件提交
cf8836ff

by 梁志锋
2016-02-16 19:38:34 +0800
Browse Files
侧边栏滚动效果修改
b51f356f

by 梁志锋
2016-02-16 19:37:27 +0800
Browse Files
提交gulp ge文件
d96c4f17

by 梁志锋
2016-02-16 19:23:35 +0800
Browse Files
Merge remote-tracking branch 'origin/beta/wap' into beta/wap
d7ae0fc3

by 梁志锋
2016-02-16 19:22:46 +0800
Browse Files
侧边栏滚动效果修改
465599f5

by 梁志锋
2016-02-16 19:22:33 +0800
Browse Files
Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap
2b17c16d

by hf
2016-02-16 18:06:57 +0800
Browse Files
code review by fei.hong: do modify app api hotfix main.js
ad4ccccd

by hf
2016-02-16 18:06:39 +0800
Browse Files
code review by fei.hong: do modify app api hotfix main.js
bc082e17

by hf
2016-02-16 18:05:59 +0800
Browse Files
code review by fei.hong: do modify app api hotfix main.js
187d2d55

by hf
2016-02-16 18:05:41 +0800
Browse Files
Merge remote-tracking branch 'origin/beta/wap' into beta/wap
dc9c23d8

by 梁志锋
2016-02-16 16:22:43 +0800
Browse Files
侧边栏点击改成touchend
b0b3b752

by 梁志锋
2016-02-16 16:22:25 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
a1b1bcd7

by 毕凯
2016-02-16 14:09:31 +0800
Browse Files
增加元宵节抽签活动
7f538e60

by 毕凯
2016-02-16 14:09:18 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
58896e21

by Rock Zhang
2016-02-16 13:55:25 +0800
Browse Files
个人中心底部为您优选商品价格显示.00
aa293808

by Rock Zhang
2016-02-16 13:54:48 +0800
Browse Files
更新到测试环境数据接口
c3e915ce

by Rock Zhang
2016-02-16 13:36:11 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
680e952e

by Rock Zhang
2016-02-16 13:34:47 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
e8c6f988

by Rock Zhang
2016-02-16 13:24:32 +0800
Browse Files
Merge branch 'beta/wap' of git.dev.yoho.cn:web/yohobuy into beta/wap
4c6eaaff

by Rock Zhang
2016-02-16 13:24:19 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
b753bd79

by Rock Zhang
2016-02-16 13:24:09 +0800
Browse Files
修复品牌商品列表页没有标题的bug ...
4794082a
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-16 13:23:26 +0800
Browse Files
Merge remote-tracking branch 'origin/develop/wap' into develop/wap
3efe09af

by 梁志锋
2016-02-16 13:23:14 +0800
Browse Files
侧边栏点透问题
839af9e2

by 梁志锋
2016-02-16 13:22:47 +0800
Browse Files
改成正式环境数据
a41b0fe7

by 梁志锋
2016-02-16 13:18:07 +0800
Browse Files
gulp ge 文件提交
6042f5e2

by 梁志锋
2016-02-16 13:15:13 +0800
Browse Files
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 Files
切换到测试环境接口地址
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