fe / yohobuy-portal-fe · Commits

11 Mar, 2016

20 commits

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
提交
6ee0cf4e

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

by liuyue
2016-03-11 14:24:10 +0800
Browse Files
网销
14414164

by liuyue
2016-03-11 14:24:02 +0800
Browse Files
Merge branch 'hotfix/changeClientVersion' into develop
6a83d694

by 周奇琪
2016-03-11 13:34:30 +0800
Browse Files
Merge branch 'hotfix/changeClientVersion'
0a8d144e

by 周奇琪
2016-03-11 13:34:29 +0800
Browse Files
修改客户端版本信息,以便完善dist新的js文件0.2.2
67aeecbe

by 周奇琪
2016-03-11 13:34:05 +0800
Browse Files
Merge branch 'release/1.5'
ac5e3750

by 周奇琪
2016-03-11 13:02:17 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
03b4661f

by 王钱钧
2016-03-11 11:21:41 +0800
Browse Files
修改bug。
78a0bfe7

by 王钱钧
2016-03-11 11:21:37 +0800
Browse Files
网销
48f86d6e

by liuyue
2016-03-11 10:45:42 +0800
Browse Files
提交
20b4df41

by weiqingting
2016-03-11 09:30:43 +0800
Browse Files

10 Mar, 2016

20 commits

预发布1.5 限购商品 VIP积分活动
0149d40d

by weiqingting
2016-03-10 21:59:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
8f8f60a2
```
# Conflicts:
#	client/js/goods/netsale-edit.js
```
by weiqingting
2016-03-10 21:42:17 +0800
Browse Files
提交
08fa7aef

by weiqingting
2016-03-10 21:34:38 +0800
Browse Files
网销
4e17ffe8

by liuyue
2016-03-10 20:36:17 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
17f269af

by liuyue
2016-03-10 19:17:45 +0800
Browse Files
网销
d93f3409

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

by weiqingting
2016-03-10 19:16:15 +0800
Browse Files
编辑器
306c526a

by weiqingting
2016-03-10 19:16:06 +0800
Browse Files
网销
1f050572

by liuyue
2016-03-10 19:10:37 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
81edd9a4

by liuyue
2016-03-10 18:49:24 +0800
Browse Files
提交
78c5cc4e

by weiqingting
2016-03-10 18:47:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
d8684dd1
```
Conflicts:
	client/js/goods/netsale-edit.js
```
by 陶雨
2016-03-10 17:37:30 +0800
Browse Files
hebing
89699faf

by 陶雨
2016-03-10 17:33:59 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
1e7b1577

by liuyue
2016-03-10 17:25:51 +0800
Browse Files
网销
14799abc

by liuyue
2016-03-10 17:25:43 +0800
Browse Files
提价
fcf07db6

by weiqingting
2016-03-10 17:24:27 +0800
Browse Files
template
7aef5e3d

by liuyue
2016-03-10 17:22:43 +0800
Browse Files
'template2'
0ec136a4

by liuyue
2016-03-10 17:20:22 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
525b9737

by liuyue
2016-03-10 17:01:29 +0800
Browse Files
网销
972e5eb7

by liuyue
2016-03-10 17:01:24 +0800
Browse Files