fe / yohobuy-portal-fe · Commits

21 Mar, 2016

25 commits

紧急提交
fff7049d

by weiqingting
2016-03-21 16:33:04 +0800
Browse Files
基础商品bug修改
a84a9831

by weiqingting
2016-03-21 16:22:35 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
9a905468

by weiqingting
2016-03-21 16:21:48 +0800
Browse Files
提交更新
809f1d5d

by weiqingting
2016-03-21 16:20:52 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.6' into release/1.6
150651a6

by 陶雨
2016-03-21 16:17:35 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
a9cd811b

by liuyue
2016-03-21 16:18:32 +0800
Browse Files
封面搭配悬浮导航修改
6752362c

by liuyue
2016-03-21 16:18:29 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
e8ace6b4

by 陶雨
2016-03-21 16:17:22 +0800
Browse Files
帮助内容修改分类名称显示逻辑及添加添加编辑提示
dd4118de

by 陶雨
2016-03-21 16:16:29 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
cb61dee9
```
# Conflicts:
#	server/config/common.js
```
by weiqingting
2016-03-21 15:52:15 +0800
Browse Files
模板2
1729793a

by weiqingting
2016-03-21 15:50:02 +0800
Browse Files
模板2修改
c4143367

by weiqingting
2016-03-21 15:48:23 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
7811be08

by 王钱钧
2016-03-21 15:06:47 +0800
Browse Files
修改基础商品规则模块bug
e9a464d3

by 王钱钧
2016-03-21 15:06:43 +0800
Browse Files
帮助内容取消加载页面时右上角的弹窗
401aeb53

by 陶雨
2016-03-21 15:00:24 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
619bcf1a
```
# Conflicts:
#	server/config/common.js
```
by weiqingting
2016-03-21 13:52:59 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
c3a474a3

by 陶雨
2016-03-21 13:44:01 +0800
Browse Files
公告上传图片添加bucket
c81b9a2f

by 陶雨
2016-03-21 13:42:41 +0800
Browse Files
封面添加颜色封面bug fix
d38cfca4

by liuyue
2016-03-21 13:42:25 +0800
Browse Files
格式化
385179ce

by 陶雨
2016-03-21 11:21:35 +0800
Browse Files
封面多选bug fix
3ff3676e

by liuyue
2016-03-21 10:41:04 +0800
Browse Files
封面多选bug fix
236a50cc

by liuyue
2016-03-21 10:39:39 +0800
Browse Files
路由修改
62ac7f93

by weiqingting
2016-03-21 10:25:31 +0800
Browse Files
修改host
165db824

by 陶雨
2016-03-21 10:23:10 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
8d9a2bd5

by 陶雨
2016-03-21 09:32:38 +0800
Browse Files

19 Mar, 2016

15 commits

网销bug提交
37f2c0a4

by weiqingting
2016-03-19 16:57:48 +0800
Browse Files
Merge branch 'release/shop_supplier_v' into release/1.6
f3be520a

by weiqingting
2016-03-19 15:59:55 +0800
Browse Files
修改样式
e962f3c9

by weiqingting
2016-03-19 15:57:36 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
20aaf8d3
```
# Conflicts:
#	client/sass/common/global.scss
```
by weiqingting
2016-03-19 15:48:20 +0800
Browse Files
基础商品提交
bc4a7e09

by weiqingting
2016-03-19 15:46:23 +0800
Browse Files
商品参数修改
2dd09468

by liuyue
2016-03-19 15:23:32 +0800
Browse Files
Merge branch 'release/shop_supplier_v' into release/1.6
d4a10220

by weiqingting
2016-03-19 14:48:00 +0800
Browse Files
供应商统一文案
80cff94e

by weiqingting
2016-03-19 14:44:33 +0800
Browse Files
样式修改
282fd895

by weiqingting
2016-03-19 14:30:15 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
1b52f2b4

by liuyue
2016-03-19 14:18:04 +0800
Browse Files
非销售属性
82277aba

by liuyue
2016-03-19 14:17:52 +0800
Browse Files
基础商品修改
3e207c21

by weiqingting
2016-03-19 14:13:45 +0800
Browse Files
Merge commit 'f08e9d2b ' into release/1.6
55cc7cb0

by weiqingting
2016-03-19 13:04:49 +0800
Browse Files
Merge branch 'release/shop_supplier_v' of http://git.dev.yoho.cn/platform/yohobu… ...
8426844a
```
…y-portal-fe into release/shop_supplier_v
```
by weiqingting
2016-03-19 12:42:01 +0800
Browse Files
供应商修改
f08e9d2b

by weiqingting
2016-03-19 12:40:22 +0800
Browse Files