fe / yohobuy-node · Commits

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

4 commits

fix
8356eb4c

by htoooth
2017-09-15 21:04:22 +0800
Browse Files
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

30 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
fix
5ad06e77

by htoooth
2017-09-14 16:29:43 +0800
Browse Files
fix
99cb0f53

by htoooth
2017-09-14 16:25:13 +0800
Browse Files
fix
0e2a77dc

by htoooth
2017-09-14 15:54:44 +0800
Browse Files
fix
9c0b7b74

by htoooth
2017-09-14 15:53:45 +0800
Browse Files
Merge branch 'hotfix/universe' into gray
0176fa27

by htoooth
2017-09-14 15:09:14 +0800
Browse Directory »
Merge remote-tracking branch 'origin/gray' into gray
cac63bf9

by htoooth
2017-09-14 15:08:50 +0800
Browse Files
Merge branch 'feature/detail-op' into gray ...
16e5e6e3
```
# Conflicts:
#	package.json
```
by htoooth
2017-09-14 15:01:17 +0800
Browse Files
fix
5b793e20

by htoooth
2017-09-14 14:55:49 +0800
Browse Files
fix
59499d98

by htoooth
2017-09-14 14:51:19 +0800
Browse Directory »
Merge branch 'hotfix/delRelate'
f3f98fd5

by 周少峰
2017-09-14 12:19:06 +0800
Browse Files
del err pull
966337d7

by 周少峰
2017-09-14 12:16:09 +0800
Browse Files
del relate
2995377f

by 周少峰
2017-09-14 12:11:15 +0800
Browse Files
del relate
d22ff47a

by 周少峰
2017-09-14 12:07:05 +0800
Browse Files
del relate
313e3278

by 周少峰
2017-09-14 12:03:52 +0800
Browse Files
upversion
09b2117e

by 周少峰
2017-09-14 11:46:03 +0800
Browse Files
Merge branch 'feature/detail-op' into gray
9aff9cec

by 周少峰
2017-09-14 11:43:13 +0800
Browse Files
merge
93c84e50

by htoooth
2017-09-14 11:36:11 +0800
Browse Files
Merge branch 'master' into feature/detail-op ...
a71a2e69
```
# Conflicts:
#	apps/product/models/detail-product-api.js
```
by htoooth
2017-09-14 11:34:47 +0800
Browse Files
Merge branch 'hotfix/addLoginCap'
e623a672

by 周少峰
2017-09-14 11:09:08 +0800
Browse Files
Merge branch 'hotfix/addLoginCap'
8d3039cc

by 周少峰
2017-09-14 10:21:51 +0800
Browse Files
fix
753220d1

by htoooth
2017-09-14 10:16:10 +0800
Browse File »
Merge remote-tracking branch 'origin/hotfix/addLoginCap' into hotfix/addLoginCap
83c39d6b

by htoooth
2017-09-14 10:00:25 +0800
Browse Files
Merge branch 'hotfix/change-name' into hotfix/addLoginCap
fe9d7f63

by htoooth
2017-09-14 09:59:51 +0800
Browse Files
up version
2d37c2bf

by 周少峰
2017-09-14 09:56:58 +0800
Browse Files
fix
0047d9bf

by htoooth
2017-09-14 09:52:19 +0800
Browse File »
format and up version
7396eb9a

by 周少峰
2017-09-14 09:07:24 +0800
Browse Files
add locallogin cap
8503148c

by 周少峰
2017-09-14 09:06:35 +0800
Browse Files

13 Sep, 2017

1 commit

Merge branch 'hotfix/ensureJit' into 'master' ...
eaa61cb4
```
jit显示接口返回标题



See merge request !164
```
by 杨延青
2017-09-13 15:05:12 +0800
Browse Files