fe / yohobuy-portal-fe2 · Commits

23 Aug, 2016

2 commits

update
48a61fac

by linlong
2016-08-23 10:45:58 +0800
Browse Files
销售类目管理--BLK字段
4a8cd749

by linlong
2016-08-23 10:04:36 +0800
Browse Files

19 Aug, 2016

8 commits

Merge branch 'portal_dev_4.9' into 'portal_dev_4.9' ...
9dd5c05d
```
Update: 增加APP直播楼层



See merge request !1
```
by ZhongW
2016-08-19 18:29:57 +0800
Browse Files
Merge branch 'portal_dev_4.9' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into portal_dev_4.9
2ff5c800

by ZhongW
2016-08-19 18:17:42 +0800
Browse Files
封面排序
5eec2b96

by ZhongW
2016-08-19 18:17:34 +0800
Browse Files
百度编辑器
3bf6162e

by lijian
2016-08-19 17:17:24 +0800
Browse Files
Update: 增加APP直播楼层
13e05e7e

by leo
2016-08-19 14:19:29 +0800
Browse Files
no message
bc9008bf

by lijian
2016-08-19 11:52:44 +0800
Browse Files
Merge branch 'hotfix-815' into portal_dev_4.9
303af277

by ZhongW
2016-08-19 10:35:09 +0800
Browse Files
分类去掉BLK
b2ae9ded

by ZhongW
2016-08-19 10:34:25 +0800
Browse Files

18 Aug, 2016

2 commits

update
7d474da9

by linlong
2016-08-18 11:32:35 +0800
Browse Files
资讯管理增加BLK字段
3f81453e

by linlong
2016-08-18 11:10:32 +0800
Browse Files

17 Aug, 2016

2 commits

展示品台筛选总数
9c45ef5b

by ZhongW
2016-08-17 18:42:15 +0800
Browse Files
更改时间控件的分跨度到1分
f90cb247

by pangjie
2016-08-17 10:10:03 +0800
Browse Files

15 Aug, 2016

1 commit

优惠折扣修改
9774ad32

by ZhongW
2016-08-15 11:28:59 +0800
Browse Files

12 Aug, 2016

2 commits

Merge branch 'promotion-0812' into portal_dev_4.9
55c8850c

by pangjie
2016-08-12 17:10:47 +0800
Browse Files
有效状态优惠券编辑
8825201c

by pangjie
2016-08-12 14:45:13 +0800
Browse Files

10 Aug, 2016

4 commits

内容发布资讯管理链接清空
9cf95915

by dongjunjie
2016-08-10 16:57:01 +0800
Browse Files
店铺装修选择销售类目时候，添加销售类目名称
9d429225

by dongjunjie
2016-08-10 14:47:21 +0800
Browse Files
Merge branch 'testBLK' into portal_dev_4.9
79cc2d66

by dongjunjie
2016-08-10 14:00:46 +0800
Browse Files
blk装修人气单品样式修改
054b99d0

by dongjunjie
2016-08-10 14:00:34 +0800
Browse Files

09 Aug, 2016

10 commits

Merge branch 'testBLK' into portal_dev_4.9
d967065f

by dongjunjie
2016-08-09 17:46:47 +0800
Browse Files
Merge branch 'grey' into testBLK
71f6c210

by dongjunjie
2016-08-09 17:46:34 +0800
Browse Files
guang的js报错
36969678

by dongjunjie
2016-08-09 17:46:16 +0800
Browse Files
店铺装修销售类目
c128554c

by dongjunjie
2016-08-09 11:29:29 +0800
Browse Files
Merge branch 'testBLK' into portal_dev_4.9 ...
916b09d8
```
# Conflicts:
#	server/package.json
```
by dongjunjie
2016-08-09 11:13:29 +0800
Browse Files
基础商品，网销列表，添加是否BLK商品筛选
b3b6b5b0

by dongjunjie
2016-08-09 11:12:19 +0800
Browse Files
Merge branch 'grey' into testBLK
3e015a90

by dongjunjie
2016-08-09 10:56:05 +0800
Browse Files
文案
f69da9c2

by dongjunjie
2016-08-09 10:40:58 +0800
Browse Files
Merge branch 'grey' into testBLK
ff894b60

by dongjunjie
2016-08-09 10:23:00 +0800
Browse Files
发布cdn
d1f846e7

by dongjunjie
2016-08-09 10:20:03 +0800
Browse Files

05 Aug, 2016

9 commits

Merge branch 'testBLK' into portal_dev_4.9
3103eac7

by dongjunjie
2016-08-05 18:23:00 +0800
Browse Files
blk装修app banner展示尺寸缩小50%
fdbbd937

by dongjunjie
2016-08-05 18:22:48 +0800
Browse Files
Merge branch 'testBLK' into portal_dev_4.9
7b573e3d

by dongjunjie
2016-08-05 17:38:20 +0800
Browse Files
Merge branch 'grey' into testBLK
89759f0d

by dongjunjie
2016-08-05 17:38:06 +0800
Browse Files
基础商品编辑页面文案
710dc16d

by dongjunjie
2016-08-05 17:37:51 +0800
Browse Files
Merge branch 'testBLK' into portal_dev_4.9 ...
7caaee6f
```
# Conflicts:
#	server/package.json
```
by dongjunjie
2016-08-05 15:29:08 +0800
Browse Files
Merge branch 'grey' into testBLK
afdfdbd4

by dongjunjie
2016-08-05 15:27:47 +0800
Browse Files
优惠码修改文案
23e79e40

by dongjunjie
2016-08-05 15:27:18 +0800
Browse Files
Merge branch 'master' into grey
8f8bd51f

by dongjunjie
2016-08-05 14:27:09 +0800
Browse Files