fe / yohobuy-portal-fe · Commits

08 Apr, 2016

16 commits

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
9784cc50
```
Conflicts:
	client/js/product/brandModels.js
	server/views/pages/product/brandModels.html
```
by 王钱钧
2016-04-08 10:51:23 +0800
Browse Files
修改bug。品牌款型传参过滤掉店铺id为-1的情况
63a00289

by 王钱钧
2016-04-08 10:48:56 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
e94f2d28

by 陶雨
2016-04-08 10:23:53 +0800
Browse Files
资源内容管理
f4443dab

by 陶雨
2016-04-08 10:23:37 +0800
Browse Files
逛
a595ba90

by weiqingting
2016-04-08 10:20:49 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
6d89ab61

by weiqingting
2016-04-08 10:04:34 +0800
Browse Files
图片上传
3b066225

by weiqingting
2016-04-08 10:04:05 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
9dc85b1d

by liuyue
2016-04-08 09:57:59 +0800
Browse Files
品牌款型系列修改
d47fa4af

by liuyue
2016-04-08 09:57:45 +0800
Browse Files
提交
4a891fdd

by weiqingting
2016-04-08 09:55:05 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
ea15758b

by weiqingting
2016-04-08 09:51:26 +0800
Browse Files
提交
35b9df4c

by weiqingting
2016-04-08 09:51:16 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
a1ee3b75

by 姜敏
2016-04-08 09:36:26 +0800
Browse Files
图片上传bug
44c9a9a7

by 姜敏
2016-04-08 09:35:59 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
2a4204ab

by 王钱钧
2016-04-08 09:34:03 +0800
Browse Files
修改bug。
7e3ab197

by 王钱钧
2016-04-08 09:33:58 +0800
Browse Files

07 Apr, 2016

24 commits

店铺装修app端初始化
aa36134e

by dongjunjie
2016-04-07 19:06:02 +0800
Browse Files
店铺装修页面
c83d07d1

by dongjunjie
2016-04-07 19:03:21 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
691829c3

by dongjunjie
2016-04-07 18:55:15 +0800
Browse Files
店铺装修页面调整
96ab14f2

by dongjunjie
2016-04-07 18:55:09 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
2d8d6a91
```
# Conflicts:
#	server/views/pages/product/brandModels.html
```
by weiqingting
2016-04-07 18:47:30 +0800
Browse Files
Merge branch 'release/1.6' into develop
ad725ef3

by weiqingting
2016-04-07 18:38:33 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
a61acb24

by 王钱钧
2016-04-07 18:37:03 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
d43ae686

by weiqingting
2016-04-07 18:36:49 +0800
Browse Files
修改bug
732cce34

by 王钱钧
2016-04-07 18:36:48 +0800
Browse Files
提交
8d116c5c

by weiqingting
2016-04-07 18:36:34 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
f8abb442

by 王钱钧
2016-04-07 18:35:38 +0800
Browse Files
修改bug
9745261a

by 王钱钧
2016-04-07 18:35:31 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
e44296f7

by 姜敏
2016-04-07 18:25:15 +0800
Browse Files
拍摄复尺bug修改（尺码测量表格，图片删除，下拉框）
676dcf00

by 姜敏
2016-04-07 18:23:35 +0800
Browse Files
店铺装修app端样式
8d71652b

by dongjunjie
2016-04-07 17:41:35 +0800
Browse Files
提交
9a36de13

by weiqingting
2016-04-07 17:11:46 +0800
Browse Files
分页控件
2b3ee69a

by weiqingting
2016-04-07 16:42:47 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
ed52ad8a

by weiqingting
2016-04-07 15:39:59 +0800
Browse Files
基础商品修改，限制个别字段修改
ad513278

by weiqingting
2016-04-07 15:39:34 +0800
Browse Files
店铺模板显示英文名称
d5a0141d

by dongjunjie
2016-04-07 15:16:23 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
c950ad98

by weiqingting
2016-04-07 14:58:31 +0800
Browse Files
图片上传bug
8a7aa921

by weiqingting
2016-04-07 14:57:52 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
3d65488d

by 王钱钧
2016-04-07 14:29:27 +0800
Browse Files
修改品牌款型接口参数。
f6469a14

by 王钱钧
2016-04-07 14:29:23 +0800
Browse Files