fe / yohobuy-node · Commits

20 Sep, 2017

4 commits

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

16 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
Merge branch 'hotfix/config'
8929bba5

by 周少峰
2017-09-18 10:24:41 +0800
Browse Files
dev confg
e1274ae4

by 周少峰
2017-09-18 10:24:16 +0800
Browse Directory »
'test3'
b1384a69

by 郝肖肖
2017-09-18 10:15:48 +0800
Browse Files
Merge branch 'master' into feature/giftCart
a0ef3576

by 郝肖肖
2017-09-18 10:04:57 +0800
Browse Files

16 Sep, 2017

5 commits

Merge branch 'hotfix/loginSwitch'
a8712de1

by 周少峰
2017-09-16 15:15:45 +0800
Browse Files
fix
9f771f7b

by htoooth
2017-09-16 15:04:20 +0800
Browse Files
fix
9125bd80

by htoooth
2017-09-16 14:41:14 +0800
Browse Files
fix
97300c89

by htoooth
2017-09-16 14:37:25 +0800
Browse Files
add switch for password login
a604f020

by 周少峰
2017-09-16 14:18:38 +0800
Browse Files

15 Sep, 2017

5 commits

fix
8356eb4c

by htoooth
2017-09-15 21:04:22 +0800
Browse Files
invoice
59218b2e

by yyq
2017-09-15 18:43:20 +0800
Browse File »
Merge branch 'gray'
e5ad2289

by yyq
2017-09-15 14:12:19 +0800
Browse Files
Merge branch 'feature/detail-op' into gray
37e2b2bd

by htoooth
2017-09-15 11:26:14 +0800
Browse Files
Merge branch 'master' into feature/detail-op
bae66498

by htoooth
2017-09-15 11:25:56 +0800
Browse Files

14 Sep, 2017

3 commits

Merge branch 'feature/detail-op' into gray
4a431fe9

by htoooth
2017-09-14 17:11:33 +0800
Browse Files
fix
22967476

by htoooth
2017-09-14 17:10:09 +0800
Browse Files
Merge branch 'feature/detail-op' into gray ...
b6fd1959
```
# Conflicts:
#	apps/product/models/detail-product-api.js
```
by htoooth
2017-09-14 16:35:36 +0800
Browse Files