fe / yohobuy-node · Commits

07 Sep, 2017

2 commits

fix
8e70bcbe

by htoooth
2017-09-07 15:47:36 +0800
Browse Files
fix
cba13b84

by htoooth
2017-09-07 15:31:27 +0800
Browse Files

06 Sep, 2017

1 commit

Merge branch 'master' into feature/detail-op
7122a9cf

by htoooth
2017-09-06 09:52:32 +0800
Browse Directory »

05 Sep, 2017

3 commits

Merge branch 'hotfix/baiduTj'
44787003

by 周少峰
2017-09-05 16:50:22 +0800
Browse Files
qcode href error
fcf39d24

by 周少峰
2017-09-05 16:38:44 +0800
Browse Files
update version and channel new products sorts
d82de0cd

by 周少峰
2017-09-05 14:50:52 +0800
Browse Files

04 Sep, 2017

2 commits

baodutj
d9eb41a3

by 周少峰
2017-09-04 10:48:26 +0800
Browse Directory »
baodutj
530139e3

by 周少峰
2017-09-04 10:43:23 +0800
Browse Directory »

01 Sep, 2017

7 commits

Merge branch 'hotfix/preSale'
fcd39325

by 周少峰
2017-09-01 14:56:50 +0800
Browse Files
presale attribute status 9|11
ebc8340b

by 周少峰
2017-09-01 14:56:24 +0800
Browse Files
Merge branch 'hotfix/preSale'
e0210565

by 周少峰
2017-09-01 13:59:44 +0800
Browse Files
include return boolean
d734ae5d

by 周少峰
2017-09-01 13:59:25 +0800
Browse Files
includes instead
01ac6d09

by 周少峰
2017-09-01 13:33:46 +0800
Browse Files
buynow and closeOrder button
9b082717

by 周少峰
2017-09-01 13:13:15 +0800
Browse Files
Merge branch 'hotfix/add-cache' into feature/detail-op ...
4fbcd8c7
```
# Conflicts:
#	apps/product/models/detail-product-api.js
#	apps/product/models/detail-service.js
```
by htoooth
2017-09-01 10:53:49 +0800
Browse Files

31 Aug, 2017

15 commits

Merge branch 'gray'
d876e22c

by 周少峰
2017-08-31 16:32:49 +0800
Browse Files
Merge branch 'hotfix/add-cache' into gray
ac610cee

by 周少峰
2017-08-31 16:32:17 +0800
Browse Files
fix
06095297

by htoooth
2017-08-31 16:28:00 +0800
Browse Files
Merge branch 'hotfix/add-cache' into gray
16428853

by 周少峰
2017-08-31 16:09:05 +0800
Browse Files
fix
ca1d84de

by htoooth
2017-08-31 15:00:21 +0800
Browse Files
Merge branch 'hotfix/invoiceType' into gray
6fcfce88

by yyq
2017-08-31 10:54:33 +0800
Browse Files
add invoice_payable_type
dd146b35

by yyq
2017-08-31 10:49:46 +0800
Browse Files
Merge branch 'hotfix/add-cache' into gray
9129ec44

by 周少峰
2017-08-31 10:23:51 +0800
Browse Files
Merge branch 'hotfix/add-cache' into feature/detail-op ...
1fc26bd8
```
# Conflicts:
#	apps/product/models/detail-service.js
```
by htoooth
2017-08-31 10:23:00 +0800
Browse Files
remove
62715ec0

by htoooth
2017-08-31 10:21:20 +0800
Browse Files
Merge branch 'feature/payOrderCtx' into gray
3883eeb0

by 周少峰
2017-08-31 10:13:33 +0800
Browse Files
fix
b582af1c

by htoooth
2017-08-31 10:06:39 +0800
Browse Files
Merge branch 'hotfix/add-cache' into feature/detail-op ...
315cc053
```
# Conflicts:
#	apps/product/models/detail-product-api.js
#	apps/product/models/detail-service.js
```
by htoooth
2017-08-31 09:56:23 +0800
Browse Files
fix cache
e4bfd9a6

by htoooth
2017-08-31 09:48:19 +0800
Browse Files
fix
6dadb71f

by htoooth
2017-08-31 09:47:36 +0800
Browse Files

30 Aug, 2017

6 commits

Merge branch 'feature/ordersCtx' into feature/payOrderCtx
6308f193

by 郝肖肖
2017-08-30 16:55:05 +0800
Browse Files
'修复冲突'
5fd01c60

by 郝肖肖
2017-08-30 16:54:33 +0800
Browse Files
Merge branch 'hotfix/salesPrice'
8b6a0dbd

by 周少峰
2017-08-30 16:49:12 +0800
Browse Files
'订单分摊价转数字'
77faa5bf

by 郝肖肖
2017-08-30 16:44:59 +0800
Browse Files
Merge branch 'hotfix/add-cache' into gray
63e10e73

by 周少峰
2017-08-30 14:41:59 +0800
Browse Files
del json parse
1b623c73

by 周少峰
2017-08-30 14:41:44 +0800
Browse Files

29 Aug, 2017

4 commits

Merge branch 'hotfix/add-cache' into gray
6f997b7e

by 周少峰
2017-08-29 17:36:30 +0800
Browse Files
add cache
97db439f

by htoooth
2017-08-29 17:29:49 +0800
Browse Files
add newproduct and articles
14d84d72

by htoooth
2017-08-29 17:22:08 +0800
Browse Files
Merge branch 'feature/payOrderCtx' into gray
e657b21e

by 周少峰
2017-08-29 17:11:13 +0800
Browse Files