fe / yohobuy-node · Commits

25 Sep, 2017

13 commits

Merge branch 'hotfix/chanpinKw' into gray
ccbe954e

by yyq
2017-09-25 15:58:23 +0800
Browse Directory »
chanpin url
449f2500

by yyq
2017-09-25 15:56:52 +0800
Browse Directory »
Merge branch 'release/6.1' into 'gray' ...
30ed38bc
```
Release/6.1



See merge request !168
```
by 杨延青
2017-09-25 15:30:47 +0800
Browse Files
jit tip
3f1cdb1a

by yyq
2017-09-25 14:23:30 +0800
Browse File »
Merge branch 'release/6.1' of git.yoho.cn:fe/yohobuy-node into release/6.1
47db7344

by yyq
2017-09-25 13:47:50 +0800
Browse Files
fix order detail
0212fe80

by yyq
2017-09-25 13:47:26 +0800
Browse Files
Merge branch 'release/6.1' into gray
b3ecfd17

by 周少峰
2017-09-25 11:16:48 +0800
Browse Files
Merge branch 'feature/couponStatus' into release/6.1
959b8e16

by 周少峰
2017-09-25 11:16:02 +0800
Browse Files
encryption string
e14b768e

by 周少峰
2017-09-25 11:15:40 +0800
Browse Files
Merge branch 'feature/couponStatus' into release/6.1
6e165909

by 周少峰
2017-09-25 10:49:11 +0800
Browse Files
format chagne
5bce73ee

by 周少峰
2017-09-25 10:46:58 +0800
Browse Files
Merge branch 'feature/couponStatus' into release/6.1
bca00d63

by 周少峰
2017-09-25 10:27:59 +0800
Browse Files
coupon status
19f8f227

by 周少峰
2017-09-25 10:27:26 +0800
Browse Files

22 Sep, 2017

15 commits

update version
bfcd6768

by 周少峰
2017-09-22 19:30:13 +0800
Browse Files
Merge branch 'release/6.1' into gray ...
3c8e26d7
```
Conflicts:
	apps/passport/models/login-service.js
	config/common.js
```
by 周少峰
2017-09-22 19:29:12 +0800
Browse Directory »
style
e6050778

by yyq
2017-09-22 15:24:15 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
ca0818ee

by yyq
2017-09-22 15:20:05 +0800
Browse Files
btm cursor
6c799fdf

by yyq
2017-09-22 15:19:34 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
27b30bca

by yyq
2017-09-22 15:01:52 +0800
Browse Files
iconfont
06d3b4b5

by yyq
2017-09-22 15:01:09 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
c767586b

by yyq
2017-09-22 14:20:54 +0800
Browse Files
Merge branch 'feature/giftCart' of git.yoho.cn:fe/yohobuy-node into feature/giftCart
efc0bf1f

by yyq
2017-09-22 14:20:28 +0800
Browse Files
del 秒
329a24d5

by yyq
2017-09-22 14:20:15 +0800
Browse Files
Merge branch 'release/6.1' of git.yoho.cn:fe/yohobuy-node into release/6.1
76a60a03

by yyq
2017-09-22 11:46:44 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
32b0ef50

by yyq
2017-09-22 11:45:49 +0800
Browse Files
return invoice tip
8d92f588

by yyq
2017-09-22 11:44:28 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
1e4a1b03

by 郝肖肖
2017-09-22 10:55:39 +0800
Browse Files
'礼品卡日期调整'
a93286de

by 郝肖肖
2017-09-22 10:54:54 +0800
Browse Files

21 Sep, 2017

12 commits

update version
a0941b8e

by yyq
2017-09-21 18:43:39 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
b440eff1

by yyq
2017-09-21 16:18:33 +0800
Browse Files
timer text
2bfb2791

by yyq
2017-09-21 16:17:32 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
50734536

by yyq
2017-09-21 15:03:54 +0800
Browse Files
dialog style
f2fb15a4

by yyq
2017-09-21 15:03:06 +0800
Browse Files
dialog style
25fb1fed

by yyq
2017-09-21 15:02:12 +0800
Browse Files
Merge branch 'feature/channel-op' into gray
8ba56c23

by 周少峰
2017-09-21 14:54:23 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
9803c01c

by yyq
2017-09-21 14:33:20 +0800
Browse Files
fix
33b3b4e1

by yyq
2017-09-21 14:32:46 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
0d4a8823

by yyq
2017-09-21 14:07:58 +0800
Browse Directory »
empty style
e68e94b9

by yyq
2017-09-21 14:07:25 +0800
Browse Files
Merge branch 'release/6.1' of git.yoho.cn:fe/yohobuy-node into release/6.1
f0b640ff

by yyq
2017-09-21 11:46:48 +0800
Browse Files