fe / yohobuy-portal-fe · Commits

31 Mar, 2016

2 commits

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
eaced907

by 陶雨
2016-03-31 09:32:48 +0800
Browse Files
资源管理
6c037d48

by 陶雨
2016-03-31 09:32:33 +0800
Browse Files

30 Mar, 2016

24 commits

Merge branch 'release/1.6' into develop ...
abc8e2d7
```
# Conflicts:
#	server/config/common.js
#	server/interface/basegoods.js
```
by weiqingting
2016-03-30 20:11:40 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
ed1953e1

by weiqingting
2016-03-30 20:08:23 +0800
Browse Files
wangxiao
6ac37915

by liuyue
2016-03-30 20:08:35 +0800
Browse Files
wangxiao
e283ab40

by liuyue
2016-03-30 20:04:58 +0800
Browse Files
店铺装修品牌列表为空判空
bd8f59ca

by dongjunjie
2016-03-30 18:05:08 +0800
Browse Files
封面图调用图片bug fix
5c670370

by liuyue
2016-03-30 17:19:00 +0800
Browse Files
保存页面崩溃bug fix 封面图调用图片
77c18cac

by liuyue
2016-03-30 16:52:11 +0800
Browse Files
路由配置路径
d94d0d49

by 姜敏
2016-03-30 16:27:17 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
ecff2ac8

by 姜敏
2016-03-30 15:57:13 +0800
Browse Files
添加校验信息
a527ea7e

by 姜敏
2016-03-30 15:57:02 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
762ba0fc

by 陶雨
2016-03-30 15:45:51 +0800
Browse Files
尺码测量
1245fcb9

by 陶雨
2016-03-30 15:45:37 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
70053d1c

by liuyue
2016-03-30 14:44:40 +0800
Browse Files
网销保存修改
6a113b64

by liuyue
2016-03-30 14:44:31 +0800
Browse Files
下载样例（路径修改）
75fb5da9

by 姜敏
2016-03-30 14:43:34 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
766ccdce

by 姜敏
2016-03-30 11:49:09 +0800
Browse Files
模特管理，试穿信息界面优化
619c3fb2

by 姜敏
2016-03-30 11:48:20 +0800
Browse Files
Merge branch 'release/1.6' into develop ...
21406fef
```
# Conflicts:
#	client/js/common/dropDown.js
#	client/package.json
```
by weiqingting
2016-03-30 10:45:41 +0800
Browse Files
下载excel
3630e274

by weiqingting
2016-03-30 10:42:52 +0800
Browse Files
去除非销售属性
1e200e84

by weiqingting
2016-03-30 10:06:07 +0800
Browse Files
款型编码修改
e987bd23

by weiqingting
2016-03-30 09:48:57 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
0ef4fd82

by liuyue
2016-03-30 09:17:53 +0800
Browse Files
页面崩溃bug fix
8be0a20e

by liuyue
2016-03-30 09:17:43 +0800
Browse Files
店铺新品上架+人气单品bug
4470468f

by dongjunjie
2016-03-30 09:17:21 +0800
Browse Files

29 Mar, 2016

14 commits

加上限制
dc15fefb

by weiqingting
2016-03-29 21:48:23 +0800
Browse Files
factorycode
84016afc

by weiqingting
2016-03-29 21:47:45 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
8eb786a1

by dongjunjie
2016-03-29 18:47:16 +0800
Browse Files
店铺装修tip
728b12bc

by dongjunjie
2016-03-29 18:46:56 +0800
Browse Files
放开skn限制
a4dbaf43

by weiqingting
2016-03-29 18:21:50 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
d74560f9

by 姜敏
2016-03-29 18:19:26 +0800
Browse Files
模特管理，图片上传，试穿信息界面优化
ac98ed2a

by 姜敏
2016-03-29 18:19:14 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
6d3ae98a

by 陶雨
2016-03-29 18:16:05 +0800
Browse Files
店铺装修修改bug
61af626d

by dongjunjie
2016-03-29 18:15:54 +0800
Browse Files
APP意见反馈管理
9d73441a

by 陶雨
2016-03-29 18:15:49 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
38e72ea1

by weiqingting
2016-03-29 17:59:42 +0800
Browse Files
Merge branch 'master' into release/1.6 ...
0c76c2c1
```
# Conflicts:
#	client/package.json
```
by weiqingting
2016-03-29 17:59:35 +0800
Browse Files
CDN 0.3.4
a6536229

by weiqingting
2016-03-29 17:56:07 +0800
Browse Files
版本 CDN 0.3.4
9bfe2f81

by weiqingting
2016-03-29 17:55:04 +0800
Browse Files