fe / yohobuy-node · Commits

21 Sep, 2017

3 commits

fix ctx
847158e7

by yyq
2017-09-21 10:51:20 +0800
Browse Files
merge
b9454a99

by yyq
2017-09-21 10:39:13 +0800
Browse Files
Merge branch 'master' into release/6.1
c983a475

by yyq
2017-09-21 10:38:27 +0800
Browse Directory »

20 Sep, 2017

25 commits

Merge branch 'feature/homeInvoice' into release/6.1
4f42ee0c

by yyq
2017-09-20 19:36:35 +0800
Browse Directory »
error tip
d9a1b32e

by yyq
2017-09-20 19:32:31 +0800
Browse Directory »
Merge branch 'feature/homeInvoice' into release/6.1
69e3b9a2

by yyq
2017-09-20 18:38:17 +0800
Browse Files
max length
cdce690e

by yyq
2017-09-20 18:37:34 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
43bd3938

by yyq
2017-09-20 18:32:19 +0800
Browse Directory »
ticket giftcard
987ee876

by yyq
2017-09-20 18:31:32 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
a4d3b21c

by yyq
2017-09-20 16:24:51 +0800
Browse Files
option
44ec62c3

by yyq
2017-09-20 16:24:18 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
4eb65b03

by yyq
2017-09-20 15:36:54 +0800
Browse Directory »
supply back dialog
db43619a

by yyq
2017-09-20 15:36:00 +0800
Browse Directory »
Merge branch 'feature/giftCart' into release/6.1
66a01bec

by 郝肖肖
2017-09-20 15:03:44 +0800
Browse File »
'礼品卡去掉验证码'
68f91df6

by 郝肖肖
2017-09-20 15:03:13 +0800
Browse Files
Merge branch 'gray'
1b472591

by 周少峰
2017-09-20 14:24:01 +0800
Browse Files
Merge branch 'feature/giftCart' of git.yoho.cn:fe/yohobuy-node into feature/giftCart
24cc3afc

by 郝肖肖
2017-09-20 14:15:31 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
d45c5c17

by yyq
2017-09-20 12:22:45 +0800
Browse Directory »
fix
43e55aa6

by yyq
2017-09-20 12:22:03 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
5d4d3709

by 郝肖肖
2017-09-20 11:43:05 +0800
Browse Directory »
'弹框按钮调整'
c74900a2

by 郝肖肖
2017-09-20 11:41:46 +0800
Browse Files
update version
4b8359c0

by yyq
2017-09-20 11:01:15 +0800
Browse File »
Merge branch 'hotfix/shopCoupon' into gray
f90057cd

by yyq
2017-09-20 11:00:32 +0800
Browse Files
coupon status
881c0216

by yyq
2017-09-20 10:59:51 +0800
Browse Files
Merge branch 'feature/service' into release/6.1
13b623b4

by 周少峰
2017-09-20 10:31:56 +0800
Browse Directory »
del ser
5319acc3

by 周少峰
2017-09-20 10:31:36 +0800
Browse Directory »
Merge branch 'feature/service' into release/6.1 ...
7b312ab2
```
Conflicts:
	config/common.js
```
by 周少峰
2017-09-20 10:29:10 +0800
Browse Directory »
del service api
db44d829

by 周少峰
2017-09-20 10:27:27 +0800
Browse Directory »

19 Sep, 2017

12 commits

Merge branch 'release/6.1' of git.yoho.cn:fe/yohobuy-node into release/6.1
18998bcd

by yyq
2017-09-19 17:53:36 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
694b7eb3

by yyq
2017-09-19 17:53:25 +0800
Browse Files
api method
59a340d3

by yyq
2017-09-19 17:53:02 +0800
Browse Files
update version
4e4cc859

by yyq
2017-09-19 16:33:32 +0800
Browse File »
Merge branch 'feature/chanpinRec' into 'gray' ...
8db40688
```
rec



See merge request !167
```
by 杨延青
2017-09-19 16:29:53 +0800
Browse Files
Merge branch 'master' into gray
a076fabc

by yyq
2017-09-19 16:27:59 +0800
Browse Files
rec
1637a9f6

by yyq
2017-09-19 16:25:55 +0800
Browse Files
Merge branch 'feature/balanceCtx' into 'gray' ...
349b919b
```
Feature/balance ctx



See merge request !166
```
by 杨延青
2017-09-19 15:22:25 +0800
Browse Files
Merge branch 'gray' into feature/balanceCtx
877e7e41

by yyq
2017-09-19 15:18:26 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
0c51c301

by 郝肖肖
2017-09-19 14:05:17 +0800
Browse Files
'2和3都是退款，礼品卡'
d6b1baaf

by 郝肖肖
2017-09-19 14:04:45 +0800
Browse Files
fix atyle
d9c6bd34

by yyq
2017-09-19 13:51:04 +0800
Browse Files