fe / yohobuy-portal-fe · Commits

12 Mar, 2016

23 commits

修改品牌款型bug
1344c319

by 王钱钧
2016-03-12 19:01:23 +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 ...
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
提交
c41b66a8

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

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

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

by weiqingting
2016-03-12 16:26:37 +0800
Browse Files
提交
0cda07ba

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

by 陶雨
2016-03-12 16:22:26 +0800
Browse Files
删除网销部分引用
df15d04b

by 陶雨
2016-03-12 16:22:13 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
0f1b82ff

by liuyue
2016-03-12 16:05:25 +0800
Browse Files
网销
ed2fd25f

by liuyue
2016-03-12 16:05:21 +0800
Browse Files
网销
cc03b233

by liuyue
2016-03-12 16:03:21 +0800
Browse Files
添加上架审核功能代码。
d84d4fec

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

by weiqingting
2016-03-12 15:46:33 +0800
Browse Files
提交
9750e364

by weiqingting
2016-03-12 15:46:25 +0800
Browse Files
合并4个模块 ...
bb92747d
```
-----------------------ty
```
by 陶雨
2016-03-12 14:23:24 +0800
Browse Files
网销部分修改 ---ty
2168db8a

by 陶雨
2016-03-12 12:44:54 +0800
Browse Files
上传完善
8eb2b128

by weiqingting
2016-03-12 10:52:48 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
2a724c58

by liuyue
2016-03-12 09:48:26 +0800
Browse Files
网销
d816cac8

by liuyue
2016-03-12 09:48:08 +0800
Browse Files

11 Mar, 2016

17 commits

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

by weiqingting
2016-03-11 19:29:10 +0800
Browse Files
搭配提交
20e45a8d

by weiqingting
2016-03-11 19:29:00 +0800
Browse Files
商品池
27d9f70e

by 陶雨
2016-03-11 18:24:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
24f35af6

by weiqingting
2016-03-11 16:26:43 +0800
Browse Files
网销
c42a3b92

by liuyue
2016-03-11 16:23:03 +0800
Browse Files
网销
6afa6738

by liuyue
2016-03-11 16:22:26 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
ad2a10e7

by weiqingting
2016-03-11 16:21:40 +0800
Browse Files
网销提交
65e867f6

by weiqingting
2016-03-11 16:21:31 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
dd808d72
```
Conflicts:
	client/js/goods/netsale-edit.js
	client/js/goods/partials/search-key.js
```
by 陶雨
2016-03-11 16:14:25 +0800
Browse Files
网销尺码信息、商品参数、商品排序设置、搜索关键词
4895eb4a

by 陶雨
2016-03-11 16:10:55 +0800
Browse Files
提交代码。
cba358c9

by dongjunjie
2016-03-11 15:19:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
5f358fb9

by weiqingting
2016-03-11 15:13:29 +0800
Browse Files
更新提交
d35b68ab

by weiqingting
2016-03-11 15:11:14 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
787ce395

by 周奇琪
2016-03-11 15:06:04 +0800
Browse Files
mobanxiugai
94e422ef

by dongjunjie
2016-03-11 15:05:39 +0800
Browse Files
Merge branch 'hotfix/delAuthValidate' into develop
bf3984b1

by 周奇琪
2016-03-11 15:05:12 +0800
Browse Files
删除前端校验
185e5c35

by 周奇琪
2016-03-11 15:04:49 +0800
Browse Files