fe / yoho-shop-manage · Commits

04 Aug, 2017

12 commits

Merge branch 'feature/suggestDev' into release/3.1
35df21ba

by 陈峰
2017-08-04 18:07:11 +0800
Browse Directory »
feedback css
c4a41139

by 陈峰
2017-08-04 18:06:36 +0800
Browse Files
dev
43528bd3

by 陈峰
2017-08-04 17:33:24 +0800
Browse Files
share bug
25fdfd9e

by OF1706
2017-08-04 17:29:18 +0800
Browse Files
some bugs
656bfcf6

by 陈峰
2017-08-04 17:22:52 +0800
Browse Files
dev
02ebdfcc

by OF1706
2017-08-04 17:16:24 +0800
Browse Files
share dev
92127e9d

by OF1706
2017-08-04 16:50:19 +0800
Browse Files
Merge branch 'feature/feedback' into 'release/3.1' ...
9a67d01c
```
Feature/feedback

feedback


See merge request !43
```
by 陈峰
2017-08-04 10:50:36 +0800
Browse Files
Merge branch 'feature/feedback' of http://git.yoho.cn/fe/yoho-shop-manage into feature/feedback
195cae5c

by OF1706
2017-08-04 10:49:23 +0800
Browse Directory »
Merge branch 'release/3.1' into feature/feedback ...
06419ef7
```
# Conflicts:
#	server/common/api-domain.js
```
by OF1706
2017-08-04 10:48:45 +0800
Browse Directory »
filter item css
b16cc3ad

by 陈峰
2017-08-04 10:42:01 +0800
Browse Directory »
feedback bug
81d69383

by OF1706
2017-08-04 10:39:19 +0800
Browse Files

03 Aug, 2017

16 commits

feedback
cc9ac5c5

by OF1706
2017-08-03 18:39:19 +0800
Browse Directory »
Merge branch 'master' into release/3.1
d6719d7e

by 陈峰
2017-08-03 15:29:30 +0800
Browse File »
merge
8228fd88

by 陈峰
2017-08-03 15:25:33 +0800
Browse Directory »
editor-safe
350fee2d

by 陈峰
2017-08-03 15:23:39 +0800
Browse Files
feedback
57995b78

by OF1706
2017-08-03 15:12:09 +0800
Browse Files
Update package.json
6297352d

by 陈峰
2017-08-03 11:56:39 +0800
Browse File »
Merge branch 'feature/upload' into 'master' ...
c1562c27
```
img skn purview



See merge request !42
```
by 陈峰
2017-08-03 11:54:33 +0800
Browse Files
img skn purview
e71780bc

by 陈峰
2017-08-03 11:54:15 +0800
Browse Directory »
Merge branch 'feature/upload' into 'master' ...
d2ee952b
```
Feature/upload



See merge request !41
```
by 陈峰
2017-08-03 11:46:43 +0800
Browse Files
文案修改
70b28edd

by 陈峰
2017-08-03 11:43:53 +0800
Browse Files
Merge branch 'feature/upload' into release/3.1
25a62075

by 陈峰
2017-08-03 11:37:35 +0800
Browse Files
Merge branch 'feature/hole' into release/3.1
f8b86654

by 陈峰
2017-08-03 11:37:18 +0800
Browse Files
editor-safe cs
53cfc5c2

by 陈峰
2017-08-03 11:36:55 +0800
Browse Files
image tip
9c119ae1

by 陈峰
2017-08-03 11:36:05 +0800
Browse Files
Merge branch 'feature/upload' into release/3.1
82abdf4c

by 陈峰
2017-08-03 10:23:21 +0800
Browse Files
sku images purview
246fc856

by 陈峰
2017-08-03 09:57:59 +0800
Browse Files

01 Aug, 2017

4 commits

Merge branch 'master' of http://git.yoho.cn/fe/yoho-shop-manage
3b368e2a

by 陈峰
2017-08-01 17:58:50 +0800
Browse Directory »
rules
c66552fe

by 陈峰
2017-08-01 17:58:41 +0800
Browse Files
Update package.json
75126541

by 陈峰
2017-08-01 17:41:23 +0800
Browse Files
Merge branch 'release/3.0' into 'master' ...
27481896
```
Release/3.0



See merge request !40
```
by 陈峰
2017-08-01 17:41:09 +0800
Browse Files

28 Jul, 2017

8 commits

detaiul col
fe768b50

by 陈峰
2017-07-28 17:41:44 +0800
Browse Files
Merge branch 'release/3.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/3.0
3474620d

by 陈峰
2017-07-28 17:40:23 +0800
Browse Files
detail col
fd5154af

by 陈峰
2017-07-28 17:40:16 +0800
Browse Files
Merge branch 'release/3.1' of http://git.yoho.cn/fe/yoho-shop-manage into release/3.1
6fd6faad

by 陈峰
2017-07-28 14:37:02 +0800
Browse Files
proxy
4fba01b2

by 陈峰
2017-07-28 14:36:56 +0800
Browse Files
Merge branch 'release/3.0' into 'release/3.1' ...
6a87f3cb
```
Release/3.0



See merge request !39
```
by 陈峰
2017-07-28 14:05:01 +0800
Browse Files
baseparams
197e6991

by 陈峰
2017-07-28 14:04:11 +0800
Browse Files
Merge branch 'storageDev' into 'release/3.0' ...
8cbce504
```
Storage dev

sellback

See merge request !38
```
by 陈峰
2017-07-28 13:46:58 +0800
Browse Files