fe / yohobuy-portal-fe2 · Commits

22 Aug, 2016

2 commits

Merge branch 'grey' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into grey
e416fa89

by lijian
2016-08-22 10:06:41 +0800
Browse Files
Merge branch 'portal_dev_4.9' into grey ...
ba274317
```
# Conflicts:
#	code/static/js.jquery/module/goods/netsale/partials/editor_recommend.js
```
by ping
2016-08-22 09:59:45 +0800
Browse Files

19 Aug, 2016

9 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
Merge branch 'portal_dev_4.9' into grey
1b5b9b2b

by lijian
2016-08-19 17:58:50 +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

3 commits

Merge branch 'portal_dev_4.9' into grey
fbb6f2f2

by ping
2016-08-18 13:30:05 +0800
Browse Files
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

6 commits

服务端提交
2bc18c90

by ZhongW
2016-08-17 19:34:48 +0800
Browse Files
Merge branch 'portal_dev_4.9' into grey
3b97b28b

by ZhongW
2016-08-17 19:29:40 +0800
Browse Files
Merge branch 'portal_dev_4.9' into grey
d7755df4

by ping
2016-08-17 19:27:05 +0800
Browse Files
展示品台筛选总数
9c45ef5b

by ZhongW
2016-08-17 18:42:15 +0800
Browse Files
服务端提交
d8b7d8b7

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

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

16 Aug, 2016

1 commit

server 端打包
54faa27b

by ZhongW
2016-08-16 10:39:26 +0800
Browse Files

15 Aug, 2016

12 commits

Merge branch 'grey' into test ...
06dd7c5f
```
# Conflicts:
#	server/package.json
```
by ping
2016-08-15 19:32:19 +0800
Browse Files
通用可以选择男封女封各一个
9e5b12db

by ZhongW
2016-08-15 19:18:31 +0800
Browse Files
提交
812417c6

by weiqingting
2016-08-15 18:30:07 +0800
Browse Files
灰度环境再次发布
26936e90

by weiqingting
2016-08-15 17:34:37 +0800
Browse Files
线上问题11079
5e159b71

by weiqingting
2016-08-15 17:33:34 +0800
Browse Files
提交
f91caa97

by weiqingting
2016-08-15 17:32:29 +0800
Browse Files
Merge branch 'protal_dev_2.2' into test
dd94f514

by weiqingting
2016-08-15 17:27:06 +0800
Browse Files
Merge branch 'portal_dev_4.9' into test ...
31b72a46
```
# Conflicts:
#	server/package.json
```
by weiqingting
2016-08-15 17:26:57 +0800
Browse Files
提交
d4410d87

by weiqingting
2016-08-15 17:16:24 +0800
Browse Files
提交
89ae0b47

by weiqingting
2016-08-15 13:35:23 +0800
Browse Files
提交
1ffb42ba

by weiqingting
2016-08-15 11:56:36 +0800
Browse Files
优惠折扣修改
9774ad32

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

13 Aug, 2016

1 commit

Merge branch 'portal_dev_4.9' into protal_dev_2.2
ffbdc1d9

by weiqingting
2016-08-13 15:48:29 +0800
Browse Files

12 Aug, 2016

3 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
网销优化修改
214f6a7e

by weiqingting
2016-08-12 13:06:03 +0800
Browse Files

10 Aug, 2016

3 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