fe / yohobuy-node · Commits

20 Dec, 2016

12 commits

update 5.2.98
4f491e65

by 周少峰
2016-12-20 13:52:31 +0800
Browse Files
Merge branch 'release/5.3' into gray
26718842

by 周少峰
2016-12-20 13:50:41 +0800
Browse Files
Merge branch 'release/5.3' of git.yoho.cn:fe/yohobuy-node into release/5.3
bc6c5c3a

by 周少峰
2016-12-20 13:49:13 +0800
Browse Files
Merge branch 'release/5.3' of git.yoho.cn:fe/yohobuy-node into release/5.3
ee2b8f6b

by yyq
2016-12-20 13:46:13 +0800
Browse Files
压缩保留引号
6f2aeb10

by yyq
2016-12-20 13:46:07 +0800
Browse Files
Merge branch 'release/5.3' into 'gray' ...
40016f8f
```
Release/5.3

增加标志调整请求速度

See merge request !28
```
by 周少峰
2016-12-20 13:44:49 +0800
Browse Files
Merge remote-tracking branch 'origin/release/5.3' into release/5.3
2b31be09

by htoooth
2016-12-20 13:38:09 +0800
Browse Files
Merge branch 'release/5.3' into feature/captcha
b586b986

by htoooth
2016-12-20 13:33:43 +0800
Browse Files
Merge branch 'gray' of git.yoho.cn:fe/yohobuy-node into gray
f365d51a

by 周少峰
2016-12-20 11:03:58 +0800
Browse Files
Merge branch 'release/5.3' into gray
43550d61

by 周少峰
2016-12-20 11:03:44 +0800
Browse Files
Merge branch 'feature/getbannerAction' into release/5.3
c8e32988

by 周少峰
2016-12-20 11:03:30 +0800
Browse Files
getbanner
3f8c14b3

by OF1706
2016-12-20 11:01:09 +0800
Browse Files

19 Dec, 2016

28 commits

Merge branch 'feature/customerService' into gray
6b7dee1d

by 李奇
2016-12-19 22:46:02 +0800
Browse Files
fixed:部分样式修改
33fd55bf

by 李奇
2016-12-19 22:39:16 +0800
Browse Files
Merge branch 'release/5.3' into gray
4444d64d

by 周少峰
2016-12-19 20:44:30 +0800
Browse Files
Merge branch 'feature/getbannerAction' into release/5.3
dc31d567

by 周少峰
2016-12-19 20:42:52 +0800
Browse Files
Merge branch 'gray' of git.yoho.cn:fe/yohobuy-node into gray
f8edad27

by 周少峰
2016-12-19 19:21:53 +0800
Browse Files
Merge branch 'feature/customerService' into gray
c1224efc

by 李奇
2016-12-19 19:20:15 +0800
Browse Files
fixed:部分样式修改
f553f690

by 李奇
2016-12-19 19:19:19 +0800
Browse Files
头部用户更新
fe2cc69a

by OF1706
2016-12-19 17:35:56 +0800
Browse Files
头部用户更新
8f81ec6f

by OF1706
2016-12-19 17:31:45 +0800
Browse Files
头部用户更新
69da7c48

by OF1706
2016-12-19 17:30:27 +0800
Browse Files
Merge branch 'release/5.3' into gray
726c6ff8

by 周少峰
2016-12-19 16:56:24 +0800
Browse Files
m
9561c48d

by 刘传洋
2016-12-19 16:38:44 +0800
Browse Files
m
986f9fba

by 刘传洋
2016-12-19 16:36:42 +0800
Browse Files
add js
f3f0783b

by htoooth
2016-12-19 15:46:02 +0800
Browse Files
add status
f5da25bf

by htoooth
2016-12-19 15:38:55 +0800
Browse Files
Merge branch 'release/5.3' into gray
696f0850

by 周少峰
2016-12-19 15:12:08 +0800
Browse Files
Merge branch 'release/5.3' of http://git.yoho.cn/fe/yohobuy-node into release/5.3
5bea714e

by 刘传洋
2016-12-19 15:03:20 +0800
Browse Files
merge from feature/3partyBind
591c6e61

by 刘传洋
2016-12-19 15:03:02 +0800
Browse Files
m
170be514

by 刘传洋
2016-12-19 15:01:40 +0800
Browse Files
m
0f7c8a26

by 刘传洋
2016-12-19 14:55:51 +0800
Browse Files
m
2d003608

by 刘传洋
2016-12-19 14:55:12 +0800
Browse Files
Merge branch 'release/5.3' into gray
f68ebd15

by 周少峰
2016-12-19 14:40:45 +0800
Browse Files
co
80f207c5

by 周少峰
2016-12-19 14:40:18 +0800
Browse Files
css import
47b3200a

by 周少峰
2016-12-19 12:11:37 +0800
Browse Files
修复CSS
01d05fdf

by 徐炜
2016-12-19 11:46:23 +0800
Browse Files
Merge branch 'feature/customerService' into gray
3ea63c06

by 徐炜
2016-12-19 11:39:09 +0800
Browse Files
Merge remote-tracking branch 'origin/feature/customerService' into feature/customerService ...
978c6423
```
# Conflicts:
#	package.json
```
by 徐炜
2016-12-19 11:35:15 +0800
Browse Files
Merge branch 'feature/customerService' into gray
012711a0

by 周少峰
2016-12-19 10:41:03 +0800
Browse Files