fe / yohobuy-portal-fe · Commits

07 May, 2016

9 commits

删除路由
649b11ee

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

by weiqingting
2016-05-07 11:00:33 +0800
Browse Files
修改数字验证控件
499ee214

by weiqingting
2016-05-07 11:00:21 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
7873d2e1
```
Conflicts:
	client/js/sourceManage/resourceManage.js
```
by 陶雨
2016-05-07 10:20:16 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
dc251009
```
Conflicts:
	client/js/sourceManage/resourceManage.js
```
by 陶雨
2016-05-07 10:14:44 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
007a936b
```
Conflicts:
	client/js/sourceManage/resourceManage.js
```
by 陶雨
2016-05-07 10:12:35 +0800
Browse Files
资源位修改删除资源位方法
58b3c3df

by 陶雨
2016-05-07 10:05:30 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
d70ba10b

by 姜敏
2016-05-07 09:58:37 +0800
Browse Files
资讯管理定时发布时间样式，资源管理删除bug修复
eddd74a5

by 姜敏
2016-05-07 09:58:26 +0800
Browse Files

06 May, 2016

31 commits

限购码、活动抽奖列表回滚到4.3版本
c21edcfe

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

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

by 周奇琪
2016-05-06 18:32:06 +0800
Browse Files
修复乱码的问题
a9fd359c

by 周奇琪
2016-05-06 18:31:39 +0800
Browse Files
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
资源内容添加双击事件
c33e97e0

by 陶雨
2016-05-06 14:13:25 +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