fe / yohobuy-portal-fe · Commits

06 May, 2016

34 commits

yoho币bug
9ff1813c

by dongjunjie
2016-05-06 18:23:13 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
bede8464

by 姜敏
2016-05-06 16:49:53 +0800
Browse Files
资讯管理-定时发布时间bug修复
7ea3dec7

by 姜敏
2016-05-06 16:49:45 +0800
Browse Files
修改灰度 url
1bbce77f

by weiqingting
2016-05-06 16:40:40 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
4f381d20

by weiqingting
2016-05-06 16:14:38 +0800
Browse Files
恢复灰度代理
40ebe3a1

by weiqingting
2016-05-06 16:14:18 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
19f36c7b

by 姜敏
2016-05-06 16:02:48 +0800
Browse Files
发券管理修改（至少一张优惠券）
f0fc9966

by 姜敏
2016-05-06 16:02:38 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
4b93bf54

by weiqingting
2016-05-06 14:33:26 +0800
Browse Files
图片上传bug
18f61360

by weiqingting
2016-05-06 14:32:57 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
14d3d2d6

by 姜敏
2016-05-06 13:43:11 +0800
Browse Files
商品-货到付款限制开启提示语修改
cace5a0e

by 姜敏
2016-05-06 13:43:03 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
fca1c161

by dongjunjie
2016-05-06 13:30:23 +0800
Browse Files
yoho币
b7c3d0ac

by dongjunjie
2016-05-06 13:30:18 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
5c51cb42

by 陶雨
2016-05-06 13:21:25 +0800
Browse Files
资源位暂时删除根据id搜索
5d1a2192

by 陶雨
2016-05-06 13:21:15 +0800
Browse Files
商品重复解决
291b5eb1

by weiqingting
2016-05-06 12:50:26 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
62c03c6e

by weiqingting
2016-05-06 11:57:00 +0800
Browse Files
bug修改
003da4db

by weiqingting
2016-05-06 11:56:54 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
170e84b0
```
Conflicts:
	client/js/sourceManage/resourceContentManage.js
```
by 陶雨
2016-05-06 11:53:24 +0800
Browse Files
还原到资源位预发布之前
2c65b8f4

by 陶雨
2016-05-06 11:51:28 +0800
Browse Files
新建品牌款型，排序默认给0
38f366a8

by dongjunjie
2016-05-06 11:47:39 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
6150fe3a

by dongjunjie
2016-05-06 11:33:54 +0800
Browse Files
代销变价，品牌变价合作，批量导入&列表页面切换
8d18556b

by dongjunjie
2016-05-06 11:33:26 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
50226be0

by 姜敏
2016-05-06 11:29:36 +0800
Browse Files
逛bug修复
17794bdd

by 姜敏
2016-05-06 11:29:28 +0800
Browse Files
创建店铺，直营店改名专卖店
a78567d3

by dongjunjie
2016-05-06 10:36:13 +0800
Browse Files
yoho币批量入库错误提示
484085e9

by dongjunjie
2016-05-06 10:24:49 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
51f234ab

by 姜敏
2016-05-06 10:15:31 +0800
Browse Files
资源位--领券楼层去除个数限制
33f38bb9

by 姜敏
2016-05-06 10:15:22 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
b228a574
```
# Conflicts:
#	server/config/common.js
```
by weiqingting
2016-05-06 10:10:15 +0800
Browse Files
逛bug修改
272b5b86

by weiqingting
2016-05-06 10:05:50 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
9576a889

by 陶雨
2016-05-06 09:57:33 +0800
Browse Files
修改host
bd78c163

by 陶雨
2016-05-06 09:57:17 +0800
Browse Files

05 May, 2016

6 commits

yoho币优化
8f36a79e

by dongjunjie
2016-05-05 18:44:56 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
555247c1

by 陶雨
2016-05-05 18:32:47 +0800
Browse Files
修改资源内容弹窗样式
14c2f723

by 陶雨
2016-05-05 18:32:36 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
7d69efab

by dongjunjie
2016-05-05 18:17:17 +0800
Browse Files
店铺装修2期优化
671f7532

by dongjunjie
2016-05-05 18:17:12 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
92ad90e7

by weiqingting
2016-05-05 17:57:03 +0800
Browse Files