wangshusheng / YOHOBUYPC · Commits

19 Jan, 2016

40 commits

Merge remote-tracking branch 'origin/master' into beta
3e3d25e0

by 梁志锋
2016-01-19 16:51:07 +0800
Browse Files
code review by fei.hong: do modify online service live 800 link for upgrade
2f39e85f

by hf
2016-01-19 15:03:52 +0800
Browse Files
修改测试环境配置
75177909

by 梁志锋
2016-01-19 13:52:11 +0800
Browse Files
gulp ge提交
39fbcf7a

by 梁志锋
2016-01-19 13:41:57 +0800
Browse Files
尺码优化
72b02eae

by 梁志锋
2016-01-19 13:40:20 +0800
Browse Files
简化尺码颜色选择的html
3845873a

by 梁志锋
2016-01-19 12:51:26 +0800
Browse Files
提交gulp ge文件
e6c4b149

by 梁志锋
2016-01-19 12:40:32 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into beta
65c32b9e

by 梁志锋
2016-01-19 12:39:48 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b0b1f23d

by 梁志锋
2016-01-19 12:39:15 +0800
Browse Files
颜色尺码选择优化
dccd86bb

by 梁志锋
2016-01-19 12:39:01 +0800
Browse Files
颜色尺码选择优化
462664ff

by 梁志锋
2016-01-19 12:38:54 +0800
Browse Files
更新到201501151152静态资源
83dab70f

by Rock Zhang
2016-01-19 11:52:17 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
4e7e5eb3

by 周少峰
2016-01-19 11:51:06 +0800
Browse Files
Merge branch 'develop' into beta
e06b37df

by Rock Zhang
2016-01-19 11:50:29 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
104c7573

by Rock Zhang
2016-01-19 11:50:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e816a20e

by whb
2016-01-19 11:49:53 +0800
Browse Files
搜索api配置
e93f2129

by whb
2016-01-19 11:49:00 +0800
Browse Files
获取高级选项搜索条件
a5cd5a79

by 周少峰
2016-01-19 11:46:23 +0800
Browse Files
Merge branch 'develop' into beta
eb2af5ff

by Rock Zhang
2016-01-19 11:45:55 +0800
Browse Files
Merge branch 'beta' of git.dev.yoho.cn:web/yohobuy into beta ...
20053710
```
Conflicts:
	static/dist/myohobuy/1.3.4/index-debug.js
	static/dist/myohobuy/1.3.4/index.css
```
by Rock Zhang
2016-01-19 11:43:44 +0800
Browse Files
提交gulp ge文件
0bae59a3

by 梁志锋
2016-01-19 11:41:17 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into beta
6722d974

by 梁志锋
2016-01-19 11:40:29 +0800
Browse Files
测试环境使用线上数据
2eb006d8

by 梁志锋
2016-01-19 11:39:50 +0800
Browse Files
Merge branch 'beta' into develop
eca69407

by Rock Zhang
2016-01-19 11:38:22 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
861bc7f6

by Rock Zhang
2016-01-19 11:38:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0ef09e6b

by 梁志锋
2016-01-19 11:37:09 +0800
Browse Files
优化尺码颜色选择
9e573015

by 梁志锋
2016-01-19 11:36:47 +0800
Browse Files
Merge branch 'beta' of git.dev.yoho.cn:web/yohobuy into beta ...
6b6d3304
```
Conflicts:
	static/dist/myohobuy/1.3.4/index-debug.js
	static/dist/myohobuy/1.3.4/index.css
```
by Rock Zhang
2016-01-19 11:33:10 +0800
Browse Files
更新到201501191130静态资源
575b4bdd

by Rock Zhang
2016-01-19 11:30:43 +0800
Browse Files
过滤掉订单详情页中yoho币，活动价，优惠券为0的情况，默认不显示 ...
a6323f41
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-19 11:29:15 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
9271c66b

by 毕凯
2016-01-19 11:21:20 +0800
Browse Files
SALE 页面折扣专场模块增加小图
d40a175d

by 毕凯
2016-01-19 11:21:15 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
82c05be0

by uedxwg
2016-01-19 11:19:26 +0800
Browse Files
个人中心文字对其修改
9abc0e20

by uedxwg
2016-01-19 11:18:51 +0800
Browse Files
index css js
591ffdf3

by whb
2016-01-19 11:15:14 +0800
Browse Files
提交gulp ge文件
c0a97064

by 梁志锋
2016-01-19 11:14:33 +0800
Browse Files
邮件订阅
d3333268

by whb
2016-01-19 11:12:31 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into beta
4ca698ca

by 梁志锋
2016-01-19 11:12:25 +0800
Browse Files
修改颜色和尺码选
7cfef2e8

by 梁志锋
2016-01-19 11:10:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4931c6f1

by 梁志锋
2016-01-19 11:09:06 +0800
Browse Files