fe / yohobuy-portal-fe · Commits

16 May, 2016

1 commit

Merge branch 'feature/4.5' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into feature/4.5 ...
21ac8eb0
```
# Conflicts:
#	client/js/goods/partials/editor_recommend.js
```
by weiqingting
2016-05-16 09:26:47 +0800
Browse Files

13 May, 2016

7 commits

tijiao
173453f1

by weiqingting
2016-05-13 19:59:18 +0800
Browse Files
网销4.5优化（尺码可编辑，小编推荐弹框）
920e5937

by 姜敏
2016-05-13 19:35:55 +0800
Browse Files
删除资源内容楼层渲染的log
e90d2988

by 陶雨
2016-05-13 17:19:15 +0800
Browse Files
修改tab属性
bbc2117c

by 陶雨
2016-05-13 16:10:32 +0800
Browse Files
Merge branch 'feature/4.5' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into feature/4.5
c3763cb2

by weiqingting
2016-05-13 14:48:03 +0800
Browse Files
4.5
08895e20

by weiqingting
2016-05-13 14:47:27 +0800
Browse Files
推荐品牌4.5-修复
2483cbff

by 姜敏
2016-05-13 14:21:25 +0800
Browse Files

12 May, 2016

1 commit

反馈管理--基本完结
4c1303af

by 姜敏
2016-05-12 18:22:17 +0800
Browse Files

11 May, 2016

11 commits

品牌热搜词管理--基本完结
8bb38dbb

by 姜敏
2016-05-11 17:39:05 +0800
Browse Files
热搜品牌初步
c25774e0

by 姜敏
2016-05-11 16:22:09 +0800
Browse Files
搜索词代码优化
277813be

by 姜敏
2016-05-11 14:45:18 +0800
Browse Files
Merge branch 'develop' into feature/4.5
f07bedf6

by weiqingting
2016-05-11 11:56:14 +0800
Browse Files
Merge branch 'feature/4.5' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into feature/4.5
f4b9b003

by weiqingting
2016-05-11 11:54:26 +0800
Browse Files
Merge branch 'develop' into release/qqtest
6ade3093

by weiqingting
2016-05-11 11:52:11 +0800
Browse Files
更改路由
8b5e0243

by 陶雨
2016-05-11 11:23:11 +0800
Browse Files
Merge branch 'develop' into release/qqtest
460e7112

by weiqingting
2016-05-11 11:19:47 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
38e2bf64
```
…-fe into release/release
```
by weiqingting
2016-05-11 11:14:23 +0800
Browse Files
切换分支
f0e368ef

by 陶雨
2016-05-11 11:00:09 +0800
Browse Files
热门品牌回归4.3
f725edaf

by 姜敏
2016-05-11 09:34:24 +0800
Browse Files

10 May, 2016

12 commits

兼容 template_intro 老数据
9d113246

by weiqingting
2016-05-10 18:10:42 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
fd7e816b
```
…-fe into release/release
```
by weiqingting
2016-05-10 17:39:38 +0800
Browse Files
link
f9ea91c8

by weiqingting
2016-05-10 17:39:26 +0800
Browse Files
修改guang bug
d7d98e79

by 王钱钧
2016-05-10 17:36:26 +0800
Browse Files
资源内容各模板标题url改为非必填
b13d90a7

by 陶雨
2016-05-10 14:31:27 +0800
Browse Files
资源内容各模板标题url改为非必填
85febfab

by 陶雨
2016-05-10 14:30:16 +0800
Browse Files
资源内容各模板标题url改为非必填
8899b48d

by 陶雨
2016-05-10 14:27:59 +0800
Browse Files
资源内容2T-nF标题url改为非必填
0098f2a2

by 陶雨
2016-05-10 13:32:11 +0800
Browse Files
专题管理添加修改商品池改为id筛选
f8954cda

by 陶雨
2016-05-10 13:23:23 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
d3faa318
```
…-fe into release/release
```
by weiqingting
2016-05-10 11:22:00 +0800
Browse Files
专题管理添加修改频道改为多选
797e15b4

by 陶雨
2016-05-10 11:18:45 +0800
Browse Files
反馈管理--初步界面
3753c139

by 姜敏
2016-05-10 11:03:56 +0800
Browse Files

09 May, 2016

8 commits

资源位内容品牌搜索修改
1253f8c1

by 陶雨
2016-05-09 19:06:02 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
5dbf69bb
```
…-fe into release/release
```
by weiqingting
2016-05-09 18:18:44 +0800
Browse Files
修改bug
5f93bf2f

by 王钱钧
2016-05-09 17:59:03 +0800
Browse Files
资源位4.4添加根据id精确搜索
c1277041

by 陶雨
2016-05-09 17:43:27 +0800
Browse Files
合并代码
d694ef75

by 陶雨
2016-05-09 17:41:09 +0800
Browse Files
Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal… ...
f0e56d27
```
…-fe into release/release
```
by weiqingting
2016-05-09 17:40:33 +0800
Browse Files
fixed bug
e67e6800

by 王钱钧
2016-05-09 17:36:19 +0800
Browse Files
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