fe / yohobuy-node · Commits

20 Sep, 2017

21 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 '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
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

7 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
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
del jit ship
16e1e336

by yyq
2017-09-19 13:40:31 +0800
Browse Files

18 Sep, 2017

12 commits

fix
afd69a5a

by yyq
2017-09-18 21:37:26 +0800
Browse Files
fix
7f32c86d

by yyq
2017-09-18 21:36:48 +0800
Browse Files
Merge branch 'release/6.1' of git.yoho.cn:fe/yohobuy-node into release/6.1
1de4e066

by yyq
2017-09-18 19:13:27 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
59fdfa94

by yyq
2017-09-18 19:13:17 +0800
Browse Files
add status
ade623f9

by yyq
2017-09-18 19:12:47 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
351afd98

by 郝肖肖
2017-09-18 16:32:38 +0800
Browse Files
'礼品卡倒计时'
b1933468

by 郝肖肖
2017-09-18 16:31:59 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
6282a3d6

by 郝肖肖
2017-09-18 15:57:29 +0800
Browse Files
'礼品卡ie8-input闪动修复'
cfd0a303

by 郝肖肖
2017-09-18 15:56:55 +0800
Browse Files
'ie8礼品卡弹框样式'
2ee31bd2

by 郝肖肖
2017-09-18 15:08:06 +0800
Browse Files
Merge branch 'feature/homeInvoice' into release/6.1
5afa96da

by yyq
2017-09-18 14:16:50 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
97f437fb

by 郝肖肖
2017-09-18 11:03:09 +0800
Browse Files