fe / yohobuy-portal-fe · Commits

09 May, 2016

11 commits

Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
15c2a3ce
```
…-fe into release/release
```
by weiqingting
2016-05-09 17:31:44 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
3e3bc6bb
```
…-fe into release/release
```
by 王钱钧
2016-05-09 17:28:44 +0800
Browse Files
修改bug
a35819f3

by 王钱钧
2016-05-09 17:26:37 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
f7864b65
```
…-fe into release/release
```
by weiqingting
2016-05-09 16:49:31 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
33359dbd
```
…-fe into release/release
```
by 姜敏
2016-05-09 16:43:31 +0800
Browse Files
资源位--热门品牌回归4.3
016d866f

by 姜敏
2016-05-09 16:39:41 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
485ff64a
```
…-fe into release/release
```
by weiqingting
2016-05-09 16:33:38 +0800
Browse Files
修改货到付款限制
42107403

by 王钱钧
2016-05-09 16:30:01 +0800
Browse Files
修改货到付款限制功能的bug
c53c05e3

by 王钱钧
2016-05-09 16:19:51 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
4da8b2dc
```
…-fe into release/release
```
by weiqingting
2016-05-09 10:04:02 +0800
Browse Files
资源位-品牌搜索修改
ed0478e3

by 姜敏
2016-05-09 10:03:50 +0800
Browse Files

07 May, 2016

16 commits

Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
fbff0a6f
```
…-fe into release/release
```
by weiqingting
2016-05-07 16:24:51 +0800
Browse Files
逛-品牌搜索修改
861abdba

by 姜敏
2016-05-07 16:18:34 +0800
Browse Files
修改样式
12392e06

by weiqingting
2016-05-07 16:05:39 +0800
Browse Files
搜索接口修改
1eda541c

by weiqingting
2016-05-07 15:13:24 +0800
Browse Files
修改搜索接口list
4cf47f5a

by weiqingting
2016-05-07 15:03:51 +0800
Browse Files
测试pre
e7b56df8

by weiqingting
2016-05-07 14:49:08 +0800
Browse Files
提交
9cc0f84e

by weiqingting
2016-05-07 14:44:28 +0800
Browse Files
专题管理添加编辑列表增加频道yhChannel字段
5f400d5f

by 陶雨
2016-05-07 11:52:43 +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

13 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