fe / yohobuy-portal-fe · Commits

12 Mar, 2016

40 commits

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

by 王钱钧
2016-03-12 20:09:40 +0800
Browse Files
修改品牌款型功能bug
896faae8

by 王钱钧
2016-03-12 20:09:32 +0800
Browse Files
Merge branch 'master' into develop ...
f0ca0453
```
# Conflicts:
#	client/js/common/edit.js
#	server/views/partials/netsale/editor-recommend.html
```
by weiqingting
2016-03-12 19:31:52 +0800
Browse Files
Merge branch 'release/1.5'
3873c6d2

by weiqingting
2016-03-12 19:28:38 +0800
Browse Files
Merge branch 'master' into develop
e880deb4

by weiqingting
2016-03-12 19:23:02 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
eda8f2f8

by weiqingting
2016-03-12 19:18:07 +0800
Browse Files
提交
c6bb4c47

by weiqingting
2016-03-12 19:17:58 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
4e830b61

by liuyue
2016-03-12 19:07:08 +0800
Browse Files
网销
955a9ae4

by liuyue
2016-03-12 19:07:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
bac9aa44

by 王钱钧
2016-03-12 19:01:28 +0800
Browse Files
修改品牌款型bug
1344c319

by 王钱钧
2016-03-12 19:01:23 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
cbbbda80

by liuyue
2016-03-12 18:51:19 +0800
Browse Files
网销
6fd6930f

by liuyue
2016-03-12 18:51:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
0023b9f8

by weiqingting
2016-03-12 17:53:43 +0800
Browse Files
提交
402f35d4

by weiqingting
2016-03-12 17:53:31 +0800
Browse Files
网销合并保存数据
7ff9f750

by 陶雨
2016-03-12 17:52:29 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
66af674b

by 周奇琪
2016-03-12 17:44:54 +0800
Browse Files
灰度调整,删除gzip的http头
9f2b152a

by 周奇琪
2016-03-12 17:44:29 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
bf1c55eb

by weiqingting
2016-03-12 17:38:51 +0800
Browse Files
提交
22482b96

by weiqingting
2016-03-12 17:38:07 +0800
Browse Files
网销
dd356065

by liuyue
2016-03-12 17:31:51 +0800
Browse Files
网销
82ec79a5

by liuyue
2016-03-12 17:14:14 +0800
Browse Files
网销
f61f1dd1

by liuyue
2016-03-12 17:13:41 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
7bbf0c9a

by weiqingting
2016-03-12 17:08:35 +0800
Browse Files
提交
1fcb46ab

by weiqingting
2016-03-12 17:08:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
d1758c0c

by 陶雨
2016-03-12 17:05:36 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
aaf633dc

by weiqingting
2016-03-12 17:01:53 +0800
Browse Files
提交
c2715293

by weiqingting
2016-03-12 17:01:36 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
d4ba4f11

by liuyue
2016-03-12 16:59:02 +0800
Browse Files
网销
7f0292b5

by liuyue
2016-03-12 16:58:53 +0800
Browse Files
提交
9e0ddc31

by weiqingting
2016-03-12 16:56:15 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
811ac167

by 王钱钧
2016-03-12 16:53:43 +0800
Browse Files
修改bug
267ec60f

by 王钱钧
2016-03-12 16:53:26 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
274b59d5

by 陶雨
2016-03-12 16:47:55 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
813a2b88
```
# Conflicts:
#	client/js/goods/netsale-edit.js
```
by weiqingting
2016-03-12 16:47:50 +0800
Browse Files
网销
d44f5b95

by liuyue
2016-03-12 16:47:43 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
b834eb91

by 陶雨
2016-03-12 16:47:27 +0800
Browse Files
帮助、专题修改部分bug
f8384f49

by 陶雨
2016-03-12 16:47:12 +0800
Browse Files
提交
c41b66a8

by weiqingting
2016-03-12 16:46:52 +0800
Browse Files
网销
b35dd31b

by liuyue
2016-03-12 16:30:32 +0800
Browse Files