fe / yohobuywap-node · Commits

28 Dec, 2016

32 commits

Merge branch 'release/5.3.1' into 'gray' ...
5ca49ee0
```
套餐埋点修改



See merge request !83
```
by 郭成尧
2016-12-28 18:06:45 +0800
Browse Files
埋点修改
cab9f67a

by zhangxiaoru
2016-12-28 17:51:29 +0800
Browse Files
Merge branch 'release/5.3.1' into 'gray' ...
12918c1b
```
search UI



See merge request !82
```
by 郭成尧
2016-12-28 16:20:15 +0800
Browse Files
search 距离
692b2da3

by zhangxiaoru
2016-12-28 16:19:27 +0800
Browse Files
search
ba6ad974

by zhangxiaoru
2016-12-28 16:13:14 +0800
Browse Files
search
9163c0fa

by zhangxiaoru
2016-12-28 16:07:15 +0800
Browse Files
Merge branch 'hotfix/qa' into gray
c6512099

by ccbikai(👎🏻🍜)
2016-12-28 15:46:00 +0800
Browse Files
客服入口调整
86e49dd7

by ccbikai(👎🏻🍜)
2016-12-28 15:39:14 +0800
Browse Files
merge
d7e0c522

by zhangxiaoru
2016-12-28 15:36:48 +0800
Browse Files
search 调整
4c372853

by zhangxiaoru
2016-12-28 15:36:14 +0800
Browse Files
改title
eb6cae1d

by lijing
2016-12-28 15:16:17 +0800
Browse Files
Merge branch 'release/5.3.1' into gray
6fb50149

by 郭成尧
2016-12-28 14:05:47 +0800
Browse Files
style-adjust
e7944c9a

by 郭成尧
2016-12-28 14:04:01 +0800
Browse Files
Merge branch 'release/5.3.1' into gray
9bc79320

by ccbikai(👎🏻🍜)
2016-12-28 10:59:23 +0800
Browse Files
Merge branch 'hotfix/favoriteBrand' into 'release/5.3.1' ...
0d1573ca
```
删除我的收藏路径不对的图片



See merge request !78
```
by 毕凯
2016-12-28 10:58:43 +0800
Browse Files
品牌
03d7e8f5

by zhangxiaoru
2016-12-28 10:58:37 +0800
Browse Files
Merge branch 'release/5.3.1' into gray
0dcc24dd

by ccbikai(👎🏻🍜)
2016-12-28 10:53:10 +0800
Browse Files
Merge branch 'gray' into release/5.3.1
4156b2c8

by ccbikai(👎🏻🍜)
2016-12-28 10:52:11 +0800
Browse Files
Merge branch 'gray' of git.yoho.cn:fe/yohobuywap-node into gray
f4dff4b6

by ccbikai(👎🏻🍜)
2016-12-28 10:51:09 +0800
Browse Files
mg-master
22c9ca8e

by 郭成尧
2016-12-28 10:34:02 +0800
Browse Files
ignore-tsd-folder
fe3a11f6

by 郭成尧
2016-12-28 10:30:52 +0800
Browse Files
Merge branch 'release/5.3.1' of git.yoho.cn:fe/yohobuywap-node into release/5.3.1
702e89fc

by 郭成尧
2016-12-28 10:27:56 +0800
Browse Files
tick-tock-twice-bug-fixed
b2d384cc

by 郭成尧
2016-12-28 10:27:29 +0800
Browse Files
merge
bc8141ae

by zhangxiaoru
2016-12-28 10:22:26 +0800
Browse Files
Merge branch 'master' into gray
cd220563

by ccbikai(👎🏻🍜)
2016-12-28 10:21:54 +0800
Browse Files
Merge branch 'revert-f568aa98 ' into 'master' ...
54b02c9a
```
Revert "客服图片暂时不能自适应"

This reverts commit f568aa98

See merge request !79
```
by 毕凯
2016-12-28 10:20:05 +0800
Browse Files
Revert "客服图片暂时不能自适应" ...
443b898a
```
This reverts commit f568aa98
```
by 毕凯
2016-12-28 10:19:36 +0800
Browse Files
merge
72b64d56

by zhangxiaoru
2016-12-28 10:19:28 +0800
Browse Files
Merge branch 'release/5.3.1' into 'gray' ...
ff910baa
```
dialog 样式



See merge request !77
```
by 郭成尧
2016-12-28 10:07:31 +0800
Browse Files
Merge branch 'master' into gray
047cfa96

by ccbikai(👎🏻🍜)
2016-12-28 10:06:46 +0800
Browse Files
dialog 样式
2aad218c

by zhangxiaoru
2016-12-28 10:06:11 +0800
Browse Files
客服图片暂时不能自适应
f568aa98

by ccbikai(👎🏻🍜)
2016-12-28 10:00:53 +0800
Browse Files

27 Dec, 2016

8 commits

Merge branch 'release/5.3.1' into gray
a31b5b2b

by ccbikai(👎🏻🍜)
2016-12-27 19:41:59 +0800
Browse Files
image error
4b751907

by zhangxiaoru
2016-12-27 19:19:08 +0800
Browse Files
Merge branch 'hotfix/wap-im' into 'master' ...
20591087
```
Hotfix/wap im

可以直接合， 显示改为 按后台配置来

See merge request !76
```
by 毕凯
2016-12-27 15:47:45 +0800
Browse Files
fix
ad7c0059

by 陈轩
2016-12-27 15:44:51 +0800
Browse Files
人工客服不在线提示，按后台配置来
801dab45

by 陈轩
2016-12-27 15:32:58 +0800
Browse Files
Merge branch 'hotfix/redbag'
15f32b72

by ccbikai(👎🏻🍜)
2016-12-27 15:06:18 +0800
Browse Files
add req.query
fd20fe57

by ccbikai(👎🏻🍜)
2016-12-27 15:05:59 +0800
Browse Files
line-style
ad19e65f

by 郭成尧
2016-12-27 14:55:37 +0800
Browse Files