fe / yohobuy-node · Commits

25 Sep, 2017

26 commits

Merge branch 'hotfix/contact' into gray
4685cdfa

by 周少峰
2017-09-25 18:38:20 +0800
Browse Directory »
my message
8a1a0f1d

by 周少峰
2017-09-25 18:37:34 +0800
Browse Directory »
Merge branch 'gray' of git.yoho.cn:fe/yohobuy-node into gray
a183a901

by 周少峰
2017-09-25 18:27:19 +0800
Browse Files
Merge branch 'hotfix/contact' into gray
0d823ae6

by 周少峰
2017-09-25 18:27:16 +0800
Browse Files
- replace *
4ca270b9

by 周少峰
2017-09-25 18:27:03 +0800
Browse Files
Merge branch 'release/6.1' into gray
8d00610d

by yyq
2017-09-25 17:52:32 +0800
Browse Files
invoice detail
db657099

by yyq
2017-09-25 17:52:06 +0800
Browse Files
Merge branch 'master' into gray
cfa466d2

by 周少峰
2017-09-25 17:47:26 +0800
Browse Files
Merge branch 'hotfix/contact'
00be9f2a

by 周少峰
2017-09-25 17:22:17 +0800
Browse Files
tell numb
4b2b30e3

by 周少峰
2017-09-25 17:21:50 +0800
Browse Files
Merge branch 'gray' of git.yoho.cn:fe/yohobuy-node into gray
c8b0d74f

by 周少峰
2017-09-25 16:54:11 +0800
Browse Files
Merge branch 'hotfix/contact' into gray
12bd8343

by 周少峰
2017-09-25 16:53:55 +0800
Browse Files
change contact
72fef056

by 周少峰
2017-09-25 16:53:42 +0800
Browse Files
Merge branch 'hotfix/chanpinKw' into gray
ccbe954e

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

by yyq
2017-09-25 15:56:52 +0800
Browse Files
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 Files
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 Directory »
fix order detail
0212fe80

by yyq
2017-09-25 13:47:26 +0800
Browse Directory »
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

14 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